劳务人员根据身份证号和名称登录提示修改
This commit is contained in:
parent
7cf26f51e0
commit
7ecc95cebe
@ -91,6 +91,8 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
||||
*/
|
||||
private static final String PW_FAILED_COUNT_PREFIX = "USER_PW_FAILED_COUNT:";
|
||||
@Autowired
|
||||
WorkerInfoServiceImpl workerInfoService;
|
||||
@Autowired
|
||||
private MechanicalEquipmentPositionDevMapper mechanicalEquipmentPositionDevMapper;
|
||||
@Autowired
|
||||
private WorkerInfoMapper workerInfoMapper;
|
||||
@ -437,7 +439,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void register(Map<String, Object> map) {
|
||||
if (StringUtils.isNotEmpty(MapUtils.getString(map, "verificationCode"))) {
|
||||
@ -622,7 +623,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private Map<String, Object> getUserInfo(SystemUser systemUser) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
CompanyConfig companyConfig = null;
|
||||
@ -766,9 +766,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
||||
return systemUser.getUserId();
|
||||
}
|
||||
|
||||
@Autowired
|
||||
WorkerInfoServiceImpl workerInfoService;
|
||||
|
||||
@Override
|
||||
public void editSystemUser(SystemUser systemUser) {
|
||||
QueryWrapper<SystemUser> queryWrapper = new QueryWrapper<>();
|
||||
@ -1500,9 +1497,12 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
||||
.eq(WorkerInfo::getIdCard, idCard)
|
||||
.eq(StrUtil.isNotBlank(projectSn), WorkerInfo::getProjectSn, projectSn)
|
||||
);
|
||||
if (CollUtil.isEmpty(workerInfos) || workerInfos.stream().anyMatch(workerInfo -> workerInfo.getInserviceType() != 1)) {
|
||||
if (CollUtil.isEmpty(workerInfos)) {
|
||||
throw new OpenAlertException("身份证号不存在");
|
||||
}
|
||||
if (workerInfos.stream().anyMatch(workerInfo -> workerInfo.getInserviceType() != 1)) {
|
||||
throw new OpenAlertException("该人员不在场");
|
||||
}
|
||||
for (WorkerInfo dev : workerInfos) {
|
||||
if (!dev.getWorkerName().equals(name)) {
|
||||
throw new OpenAlertException("身份证号和人员姓名不匹配");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user