|
@@ -153,12 +153,12 @@ public class WorkerWarrantyLogic {
|
|
|
|
|
|
|
|
|
//网点名称
|
|
|
- Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
|
|
|
+/* Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
|
|
|
.eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
|
.in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getType().equals(1), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
|
|
|
.eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
|
|
|
.list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
|
|
|
- log.info("网点");
|
|
|
+ log.info("网点");*/
|
|
|
|
|
|
//网点名称
|
|
|
Map<String, User> userMap = userService.lambdaQuery()
|
|
@@ -174,7 +174,8 @@ public class WorkerWarrantyLogic {
|
|
|
int rowIndex = i + 2;
|
|
|
List<Object> row = (List<Object>) objects.get(i);
|
|
|
|
|
|
- AdminWebsit adminWebsit = adminWebsitMap.get((String) row.get(0));
|
|
|
+ AdminWebsit adminWebsit = adminWebsitService.getById((String) row.get(0));
|
|
|
+ // AdminWebsit adminWebsit = adminWebsitMap.get((String) row.get(0));
|
|
|
User user = userMap.get((String) row.get(8));
|
|
|
|
|
|
|