|
|
@@ -214,7 +214,7 @@ public class UserLogic {
|
|
|
.eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
|
.eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
|
|
|
.list();
|
|
|
- Map<String, AdminWebsit> websitMap = list.stream().collect(Collectors.toMap(AdminWebsit::getName, Function.identity()));
|
|
|
+ Map<String, AdminWebsit> websitMap = list.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
|
|
|
int index = 0;
|
|
|
//先删除
|
|
|
userWaitService.lambdaUpdate()
|
|
|
@@ -231,7 +231,7 @@ public class UserLogic {
|
|
|
String idcard = (String) row.get(1);
|
|
|
String mobile = (String) row.get(2);
|
|
|
String userType = (String) row.get(3);
|
|
|
- String websitName = (String) row.get(4);
|
|
|
+ String websitId = (String) row.get(4);
|
|
|
String bankAccount = (String) row.get(5);
|
|
|
String workerNumber = (String) row.get(6);
|
|
|
if (StringUtils.isAnyBlank(name, mobile, userType)) {
|
|
|
@@ -246,10 +246,10 @@ public class UserLogic {
|
|
|
}
|
|
|
AdminWebsit adminWebsit = null;
|
|
|
if (userTypeEnum == UserTypeEnum.WORKER) {
|
|
|
- if (StringUtils.isBlank(websitName)) {
|
|
|
- throw new RemoteServiceException(errPrefix + "网点名称不能为空");
|
|
|
+ if (StringUtils.isBlank(websitId)) {
|
|
|
+ throw new RemoteServiceException(errPrefix + "网点编号不能为空");
|
|
|
}
|
|
|
- adminWebsit = websitMap.get(websitName);
|
|
|
+ adminWebsit = websitMap.get(websitId);
|
|
|
if (Objects.isNull(adminWebsit)) {
|
|
|
throw new RemoteServiceException(errPrefix + "网点不存在");
|
|
|
}
|
