pssr：

-修改验证当前数据状态
-单元必填
-确认人选择后取消所有多选框
-点x后不会被样式覆盖

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -253,6 +253,10 @@ public class TPssrAirtightController extends BaseController {
     @Log(title = "气密", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrAirtight tPssrAirtight) {
+        TPssrAirtight entity = tPssrAirtightService.selectTPssrAirtightById(tPssrAirtight.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrAirtight.getConfirm1().equals(tPssrAirtight.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAlarmController.java

@@ -87,6 +87,10 @@ public class TPssrAlarmController extends BaseController {
     @Log(title = "报警联锁值确认", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrAlarm tPssrAlarm) {
+        TPssrAlarm entity = tPssrAlarmService.selectTPssrAlarmById(tPssrAlarm.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         return toAjax(tPssrAlarmService.updateTPssrAlarm(tPssrAlarm));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java

@@ -288,6 +288,10 @@ public class TPssrAnalyzerController extends BaseController {
     @Log(title = "在线分析仪", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
+        TPssrAnalyzer entity = tPssrAnalyzerService.selectTPssrAnalyzerById(tPssrAnalyzer.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrAnalyzer.getConfirm1().equals(tPssrAnalyzer.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -336,6 +336,10 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrBlind tPssrBlind) {
+        TPssrBlind entity = tPssrBlindService.selectTPssrBlindById(tPssrBlind.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java

@@ -320,6 +320,10 @@ public class TPssrCircuitController extends BaseController {
     @Log(title = "短接", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrCircuit tPssrCircuit) {
+        TPssrCircuit entity = tPssrCircuitService.selectTPssrCircuitById(tPssrCircuit.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrCircuit.getConfirm1().equals(tPssrCircuit.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -397,6 +397,10 @@ public class TPssrCleaningController extends BaseController {
     @Log(title = "设备清洁", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrCleaning tPssrCleaning) {
+        TPssrCleaning entity = tPssrCleaningService.selectTPssrCleaningById(tPssrCleaning.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -308,6 +308,10 @@ public class TPssrFrameController extends BaseController {
     @Log(title = "支（吊）架", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrFrame tPssrFrame) {
+        TPssrFrame entity = tPssrFrameService.selectTPssrFrameById(tPssrFrame.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrFrame.getConfirm1().equals(tPssrFrame.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java

@@ -290,6 +290,10 @@ public class TPssrFranklinismController extends BaseController {
     @Log(title = "静电接地，跨接", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrFranklinism tPssrFranklinism) {
+        TPssrFranklinism entity = tPssrFranklinismService.selectTPssrFranklinismById(tPssrFranklinism.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrFranklinism.getConfirm1().equals(tPssrFranklinism.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java

@@ -284,6 +284,10 @@ public class TPssrGasdetectorController extends BaseController {
     @Log(title = "气体检测器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrGasdetector tPssrGasdetector) {
+        TPssrGasdetector entity = tPssrGasdetectorService.selectTPssrGasdetectorById(tPssrGasdetector.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrGasdetector.getConfirm1().equals(tPssrGasdetector.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -435,6 +435,10 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
+        TPssrInstrumentCalibration entity = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(tPssrInstrumentCalibration.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLightingController.java

@@ -216,6 +216,10 @@ public class TPssrLightingController extends BaseController {
     @Log(title = "照明", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrLighting tPssrLighting) {
+        TPssrLighting entity = tPssrLightingService.selectTPssrLightingById(tPssrLighting.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrLighting.getConfirm1().equals(tPssrLighting.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLockController.java

@@ -275,6 +275,10 @@ public class TPssrLockController extends BaseController {
     @Log(title = "锁开锁关阀门状态", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrLock tPssrLock) {
+        TPssrLock entity = tPssrLockService.selectTPssrLockById(tPssrLock.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrLock.getLockeder().equals(tPssrLock.getConfirm())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -321,6 +321,10 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMaterial tPssrMaterial) {
+        TPssrMaterial entity = tPssrMaterialService.selectTPssrMaterialById(tPssrMaterial.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialRawController.java

@@ -140,6 +140,10 @@ public class TPssrMaterialRawController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMaterialRaw tPssrMaterialRaw) {
+        TPssrMaterialRaw entity = tPssrMaterialRawService.selectTPssrMaterialRawById(tPssrMaterialRaw.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrMaterialRaw.getConfirm1().equals(tPssrMaterialRaw.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java

@@ -297,6 +297,10 @@ public class TPssrMeasureController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMeasure tPssrMeasure) {
+        TPssrMeasure entity = tPssrMeasureService.selectTPssrMeasureById(tPssrMeasure.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrMeasure.getConfirm1().equals(tPssrMeasure.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -283,6 +283,10 @@ public class TPssrMocController extends BaseController {
     @Log(title = "MOC完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMoc tPssrMoc) {
+        TPssrMoc entity = tPssrMocService.selectTPssrMocById(tPssrMoc.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrMoc.getConfirm1().equals(tPssrMoc.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -287,6 +287,10 @@ public class TPssrMotorController extends BaseController {
     @Log(title = "电机设备", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMotor tPssrMotor) {
+        TPssrMotor entity = tPssrMotorService.selectTPssrMotorById(tPssrMotor.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrMotor.getConfirm1().equals(tPssrMotor.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -340,6 +340,10 @@ public class TPssrNitrogenController extends BaseController {
     @Log(title = "系统氮气置换", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrNitrogen tPssrNitrogen) {
+        TPssrNitrogen entity = tPssrNitrogenService.selectTPssrNitrogenById(tPssrNitrogen.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -242,6 +242,10 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @Log(title = "检修项目-换热器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulExchanger tPssrOverhaulExchanger) {
+        TPssrOverhaulExchanger entity = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(tPssrOverhaulExchanger.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         tPssrFileService.updateFileRelevance(tPssrOverhaulExchanger.getFileIds(), "jxxm-hrq", tPssrOverhaulExchanger.getId(), tPssrOverhaulExchanger.getSubId());
         return toAjax(tPssrOverhaulExchangerService.updateTPssrOverhaulExchanger(tPssrOverhaulExchanger));
     }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -380,6 +380,10 @@ public class TPssrOverhaulFilterController extends BaseController {
     @Log(title = "检修项目-过滤器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter) {
+        TPssrOverhaulFilter entity = tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(tPssrOverhaulFilter.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         tPssrFileService.updateFileRelevance(tPssrOverhaulFilter.getFileIds(), "jxxm-glq", tPssrOverhaulFilter.getId(), tPssrOverhaulFilter.getSubId());
         return toAjax(tPssrOverhaulFilterService.updateTPssrOverhaulFilter(tPssrOverhaulFilter));
     }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java

@@ -202,6 +202,10 @@ public class TPssrOverhaulPipeController extends BaseController {
     @Log(title = "检修项目-管线", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulPipe tPssrOverhaulPipe) {
+        TPssrOverhaulPipe entity = tPssrOverhaulPipeService.selectTPssrOverhaulPipeById(tPssrOverhaulPipe.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         tPssrFileService.updateFileRelevance(tPssrOverhaulPipe.getFileIds(), "jxxm-gx", tPssrOverhaulPipe.getId(), tPssrOverhaulPipe.getSubId());
         return toAjax(tPssrOverhaulPipeService.updateTPssrOverhaulPipe(tPssrOverhaulPipe));
     }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPumpController.java

@@ -204,6 +204,10 @@ public class TPssrOverhaulPumpController extends BaseController {
     @Log(title = "检修项目-泵", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulPump tPssrOverhaulPump) {
+        TPssrOverhaulPump entity = tPssrOverhaulPumpService.selectTPssrOverhaulPumpById(tPssrOverhaulPump.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         tPssrFileService.updateFileRelevance(tPssrOverhaulPump.getFileIds(), "jxxm-b", tPssrOverhaulPump.getId(), tPssrOverhaulPump.getSubId());
         return toAjax(tPssrOverhaulPumpService.updateTPssrOverhaulPump(tPssrOverhaulPump));
     }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -373,6 +373,10 @@ public class TPssrOverhaulTowerController extends BaseController {
     @Log(title = "检修项目-塔罐", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulTower tPssrOverhaulTower) {
+        TPssrOverhaulTower entity = tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(tPssrOverhaulTower.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         tPssrFileService.updateFileRelevance(tPssrOverhaulTower.getFileIds(), "jxxm-tg", tPssrOverhaulTower.getId(), tPssrOverhaulTower.getSubId());
         return toAjax(tPssrOverhaulTowerService.updateTPssrOverhaulTower(tPssrOverhaulTower));
     }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -405,6 +405,10 @@ public class TPssrOverhaulValveController extends BaseController {
     @Log(title = "检修项目-阀门", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulValve tPssrOverhaulValve) {
+        TPssrOverhaulValve entity = tPssrOverhaulValveService.selectTPssrOverhaulValveById(tPssrOverhaulValve.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         tPssrFileService.updateFileRelevance(tPssrOverhaulValve.getFileIds(), "jxxm-fm", tPssrOverhaulValve.getId(), tPssrOverhaulValve.getSubId());
         return toAjax(tPssrOverhaulValveService.updateTPssrOverhaulValve(tPssrOverhaulValve));
     }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -270,6 +270,10 @@ public class TPssrPipeController extends BaseController {
     @Log(title = "管道", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPipe tPssrPipe) {
+        TPssrPipe entity = tPssrPipeService.selectTPssrPipeById(tPssrPipe.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrPipe.getConfirmer1().equals(tPssrPipe.getConfirmer2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java

@@ -210,6 +210,10 @@ public class TPssrPowerController extends BaseController {
     @Log(title = "临时电源", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPower tPssrPower) {
+        TPssrPower entity = tPssrPowerService.selectTPssrPowerById(tPssrPower.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrPower.getConfirm1().equals(tPssrPower.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java

@@ -299,6 +299,10 @@ public class TPssrProtectionController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrProtection tPssrProtection) {
+        TPssrProtection entity = tPssrProtectionService.selectTPssrProtectionById(tPssrProtection.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrProtection.getConfirm1().equals(tPssrProtection.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -213,6 +213,10 @@ public class TPssrPublicController extends BaseController {
     @Log(title = "公用工程", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPublic tPssrPublic) {
+        TPssrPublic entity = tPssrPublicService.selectTPssrPublicById(tPssrPublic.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrPublic.getConfirm1().equals(tPssrPublic.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java

@@ -299,6 +299,10 @@ public class TPssrPumpCleaningController extends BaseController {
     @Log(title = "机泵过滤器清理工作清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpCleaning tPssrPumpCleaning) {
+        TPssrPumpCleaning entity = tPssrPumpCleaningService.selectTPssrPumpCleaningById(tPssrPumpCleaning.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrPumpCleaning.getConfirmer1().equals(tPssrPumpCleaning.getConfirmer2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -300,6 +300,10 @@ public class TPssrPumpFillController extends BaseController {
     @Log(title = "机泵润滑油加注确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpFill tPssrPumpFill) {
+        TPssrPumpFill entity = tPssrPumpFillService.selectTPssrPumpFillById(tPssrPumpFill.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrPumpFill.getConfirmer1().equals(tPssrPumpFill.getConfirmer2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java

@@ -296,6 +296,10 @@ public class TPssrPumpOverhaulController extends BaseController {
     @Log(title = "机泵检修完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpOverhaul tPssrPumpOverhaul) {
+        TPssrPumpOverhaul entity = tPssrPumpOverhaulService.selectTPssrPumpOverhaulById(tPssrPumpOverhaul.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrPumpOverhaul.getConfirmer1().equals(tPssrPumpOverhaul.getConfirmer2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java

@@ -297,6 +297,10 @@ public class TPssrSafetyBleedController extends BaseController {
     @Log(title = "安全设施-紧急泄放阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBleed tPssrSafetyBleed) {
+        TPssrSafetyBleed entity = tPssrSafetyBleedService.selectTPssrSafetyBleedById(tPssrSafetyBleed.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrSafetyBleed.getConfirmer1().equals(tPssrSafetyBleed.getConfirmer2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java

@@ -297,6 +297,10 @@ public class TPssrSafetyBreathController extends BaseController {
     @Log(title = "安全设施-呼吸阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBreath tPssrSafetyBreath) {
+        TPssrSafetyBreath entity = tPssrSafetyBreathService.selectTPssrSafetyBreathById(tPssrSafetyBreath.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrSafetyBreath.getConfirmer1().equals(tPssrSafetyBreath.getConfirmer2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java

@@ -295,6 +295,10 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
+        TPssrSafetyBrust entity = tPssrSafetyBrustService.selectTPssrSafetyBrustById(tPssrSafetyBrust.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyFlamearresterController.java

@@ -289,6 +289,10 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @Log(title = "安全设施-阻火器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
+        TPssrSafetyFlamearrester entity = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterById(tPssrSafetyFlamearrester.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrSafetyFlamearrester.getConfirmer1().equals(tPssrSafetyFlamearrester.getConfirmer2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java

@@ -240,6 +240,10 @@ public class TPssrSafetyValveController extends BaseController {
     @Log(title = "安全设施-安全阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyValve tPssrSafetyValve) {
+        TPssrSafetyValve entity = tPssrSafetyValveService.selectTPssrSafetyValveById(tPssrSafetyValve.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrSafetyValve.getConfirmer1().equals(tPssrSafetyValve.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java

@@ -218,6 +218,10 @@ public class TPssrTorchvocController extends BaseController {
     @Log(title = "火炬，VOC系统", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrTorchvoc tPssrTorchvoc) {
+        TPssrTorchvoc entity = tPssrTorchvocService.selectTPssrTorchvocById(tPssrTorchvoc.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrTorchvoc.getConfirm1().equals(tPssrTorchvoc.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -226,6 +226,10 @@ public class TPssrVesselController extends BaseController {
     @Log(title = "压力容器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrVessel tPssrVessel) {
+        TPssrVessel entity = tPssrVesselService.selectTPssrVesselById(tPssrVessel.getId());
+        if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
+            return  AjaxResult.error("当前状态不可修改！");
+        }
         if (tPssrVessel.getConfirmer1().equals(tPssrVessel.getConfirmer2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }

master/src/main/resources/mybatis/pssr/TPssrAboveallMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="includePublic != null "> and include_public = #{includePublic}</if>
             <if test="unitDes != null  and unitDes != ''"> and unit_des = #{unitDes}</if>
             <if test="plantMgr != null  "> and plant_mgr = #{plantMgr}</if>
@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="includePublic != null">include_public = #{includePublic},</if>
             <if test="unitDes != null">unit_des = #{unitDes},</if>
             <if test="plantMgr != null">plant_mgr = #{plantMgr},</if>

master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml

@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="uptoStandard != null "> and upto_standard = #{uptoStandard}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
@@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrAlarmMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}

master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrApproveMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="cbpMgr != null">cbp_mgr = #{cbpMgr},</if>
             <if test="ctmMgr != null">ctm_mgr = #{ctmMgr},</if>
             <if test="ctaMgr != null">cta_mgr = #{ctaMgr},</if>

master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml

@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="blindType != null "> and blind_type = #{blindType}</if>
             <if test="startupStatus != null "> and startup_status = #{startupStatus}</if>
@@ -259,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="installStatus != null">install_status = #{installStatus},</if>
             <if test="removeStatus != null">remove_status = #{removeStatus},</if>
@@ -281,7 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml

@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
@@ -172,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="devType!= null  and devType!=''"> and dev_type = #{devType}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="devType != null">dev_type = #{devType},</if>
         </trim>
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrContentModelMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="forShort != null "> and for_short = #{forShort}</if>
             <if test="deptUnit != null "> and dept_unit = #{deptUnit}</if>
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="forShort != null">for_short = #{forShort},</if>
             <if test="deptUnit != null">dept_unit = #{deptUnit},</if>

master/src/main/resources/mybatis/pssr/TPssrFileMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where file_id = #{fileId}
     </update>

master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml

@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null "> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null "> and confirm2 = #{confirm2}</if>
@@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -271,7 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrFrameModelMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/pssr/TPssrFranklinismMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
         </trim>
         where id in

master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrHygieneMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml

@@ -68,7 +68,7 @@ d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.conf
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null "> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null "> and confirm2 = #{confirm2}</if>
@@ -168,7 +168,7 @@ d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.conf
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -189,7 +189,7 @@ d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.conf
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrInstrumentTestMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (instrument_number like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
@@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrLightingMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
@@ -152,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -172,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
         </trim>
         where id in

master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="lockPost != null "> and lock_post = #{lockPost}</if>
             <if test="lockCode != null "> and lock_code = #{lockCode}</if>
@@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="lockPost != null">lock_post = #{lockPost},</if>
             <if test="lockCode != null">lock_code = #{lockCode},</if>
@@ -222,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrMaterialMapper.xml

@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id in

master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml

@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -183,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrMeasureMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
             <if test="confirmationDate != null "> and confirmation_date = #{confirmationDate}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
@@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirm1 != null and confirm1 != ''">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null and confirm2 != ''">confirm2 = #{confirm2},</if>
             <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveId != null">approve_id = #{approveId},</if>
             <if test="subId != null">sub_id = #{subId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirm1 != null and confirm1 != ''">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null and confirm2 != ''">confirm2 = #{confirm2},</if>
             <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="createrCode != null">creater_code = #{createrCode},</if>
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>

master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (moc_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
@@ -152,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="dewPoint != null "> and dew_point = #{dewPoint}</if>
             <if test="dewPointValue != null "> and dew_point_value = #{dewPointValue}</if>
@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="dewPoint != null">dew_point = #{dewPoint},</if>
             <if test="dewPointValue != null">dew_point_value = #{dewPointValue},</if>
@@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or tag_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="completionStatus != null">completion_status = #{completionStatus},</if>
         </trim>
@@ -196,7 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
             <if test="changeClean != null "> and change_clean = #{changeClean}</if>
@@ -162,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="completionStatus != null">completion_status = #{completionStatus},</if>
             <if test="changeClean != null">change_clean = #{changeClean},</if>
@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrOverhaulPipeMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrOverhaulPumpMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or tag_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="completionStatus != null">completion_status = #{completionStatus},</if>
         </trim>
@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml

@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -198,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="completionStatus != null">completion_status = #{completionStatus},</if>
         </trim>
@@ -214,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrPatrolMapper.xml

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml

@@ -59,7 +59,7 @@
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (pipeline_name like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
@@ -178,7 +178,7 @@
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -202,7 +202,7 @@
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
             <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrPowerMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
@@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrProgrammeMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="unit != null "> and unit = #{unit}</if>
             <if test="writeDone != null "> and write_done = #{writeDone}</if>
@@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="writeDone != null">write_done = #{writeDone},</if>
@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrPublicMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null "> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null "> and confirm2 = #{confirm2}</if>
@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (position like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
@@ -165,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -181,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
@@ -181,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -197,7 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
@@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrRegionMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
             <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -215,7 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -233,7 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or dev_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -177,7 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
             <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -177,7 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
             <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrSafetyValveMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or dev_no like concat('%',concat(#{searchValue},'%')))</if>
@@ -182,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrSubcontentMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="unitDes != null  and unitDes != ''"> and unit_des = #{unitDes}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="region != null  and region != ''"> and region = #{region}</if>
@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="unitDes != null">unit_des = #{unitDes},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="region != null">region = #{region},</if>
@@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrTorchvocMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
         </trim>
         where id in

master/src/main/resources/mybatis/pssr/TPssrTurndownMapper.xml

@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirmer1 != null  and confirmer1 != ''"> and confirmer1 = #{confirmer1}</if>
             <if test="confirmer2 != null  and confirmer2 != ''"> and confirmer2 = #{confirmer2}</if>
             <if test="confirmationDate != null "> and confirmation_date = #{confirmationDate}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null"> and remarks = #{remarks}</if>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
@@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
             <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
             <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
             <if test="subId != null">sub_id = #{subId},</if>
             <if test="approveId != null">approve_id = #{approveId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
+            <if test="remarks != null ">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

ui/src/views/pssr/aboveall/index.vue

@@ -216,7 +216,7 @@
           </el-col>
         </el-row>
         <el-card class="mb10">
-          <el-table :data="subcontents" v-loading="subloading" border :row-class-name="tableRowClassName"
+          <el-table ref="subcontentTable" :data="subcontents" v-loading="subloading" border :row-class-name="tableRowClassName"
                     @selection-change="handleSubSelectionChange" max-height="500">
             <el-table-column label="所属部门" align="center" prop="deptUnit" :show-overflow-tooltip="true" width="80"/>
             <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
@@ -475,6 +475,9 @@ export default {
         id: [
           {required: true, message: '模板不能为空！', trigger: "blur"}
         ],
+        unit: [
+          {required: true, message: '单元不能为空！', trigger: "blur"}
+        ],
       }
     };
   },
@@ -549,6 +552,7 @@ export default {
         // 只更新当前行
         this.$set(currentRow, 'confirm', val);
       }
+      this.$refs.subcontentTable.clearSelection();
     },
     handleSubSelectionChange(selection) {
       this.subRows = selection
@@ -775,7 +779,9 @@ export default {
 </script>
 <style>
 /* 定义不同状态对应的颜色 */
-.el-table .row-remove {
+.el-table .row-remove,
+.el-table .row-remove:hover > td {
   background-color: rgb(251, 112, 112) !important;
 }
+
 </style>