diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index d0feb2d..dd1a359 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -80,7 +80,6 @@ public class SystemUserServiceImpl extends ServiceImpl i.getState() < 2).collect(Collectors.toList()).size() == 0) { state = 3; } - if (state != 2) { - LambdaUpdateWrapper recordWrapper = Wrappers.lambdaUpdate(); - recordWrapper.set(InspectRecord::getState, state); - if (state == 4) { - recordWrapper.set(InspectRecord::getSolveTime, new Date()); - } - recordWrapper.eq(InspectRecord::getId, inspectQuestion.getRecordId()); - inspectRecordService.update(recordWrapper); + LambdaUpdateWrapper recordWrapper = Wrappers.lambdaUpdate(); + recordWrapper.set(InspectRecord::getState, state); + if (state == 4) { + recordWrapper.set(InspectRecord::getSolveTime, new Date()); } + recordWrapper.eq(InspectRecord::getId, inspectQuestion.getRecordId()); + inspectRecordService.update(recordWrapper); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java index 5ae684c..04730dd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java @@ -164,6 +164,9 @@ public class InspectRecordServiceImpl extends ServiceImpl l.getState() == 4).collect(Collectors.toList()).size() != list.size()) { + return true; + } return this.updateById(inspectRecord); } return false; @@ -225,8 +228,6 @@ public class InspectRecordServiceImpl extends ServiceImpllambdaQuery().eq(Engineering::getEngineeringSn, inspectRecordVo.getEngineeringSn())).getProjectSn(); inspectRecordVo.setProjectSn(projectSn);