Forráskód Böngészése

备注非空判断

jiangbiao 6 hónapja
szülő
commit
64ea1c7694
44 módosított fájl, 84 hozzáadás és 84 törlés
  1. 2 2
      master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml
  2. 2 2
      master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml
  3. 2 2
      master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml
  4. 1 1
      master/src/main/resources/mybatis/pssr/TPssrContentModelMapper.xml
  5. 1 1
      master/src/main/resources/mybatis/pssr/TPssrFileMapper.xml
  6. 2 2
      master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml
  7. 2 2
      master/src/main/resources/mybatis/pssr/TPssrFranklinismMapper.xml
  8. 2 2
      master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml
  9. 2 2
      master/src/main/resources/mybatis/pssr/TPssrHygieneMapper.xml
  10. 2 2
      master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml
  11. 2 2
      master/src/main/resources/mybatis/pssr/TPssrInstrumentTestMapper.xml
  12. 2 2
      master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml
  13. 2 2
      master/src/main/resources/mybatis/pssr/TPssrLightingMapper.xml
  14. 2 2
      master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml
  15. 2 2
      master/src/main/resources/mybatis/pssr/TPssrMaterialMapper.xml
  16. 2 2
      master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml
  17. 2 2
      master/src/main/resources/mybatis/pssr/TPssrMeasureMapper.xml
  18. 2 2
      master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml
  19. 2 2
      master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml
  20. 2 2
      master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml
  21. 2 2
      master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml
  22. 2 2
      master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml
  23. 2 2
      master/src/main/resources/mybatis/pssr/TPssrOverhaulPipeMapper.xml
  24. 2 2
      master/src/main/resources/mybatis/pssr/TPssrOverhaulPumpMapper.xml
  25. 2 2
      master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml
  26. 2 2
      master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml
  27. 2 2
      master/src/main/resources/mybatis/pssr/TPssrPatrolMapper.xml
  28. 2 2
      master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml
  29. 2 2
      master/src/main/resources/mybatis/pssr/TPssrPowerMapper.xml
  30. 2 2
      master/src/main/resources/mybatis/pssr/TPssrProgrammeMapper.xml
  31. 2 2
      master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml
  32. 2 2
      master/src/main/resources/mybatis/pssr/TPssrPublicMapper.xml
  33. 2 2
      master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml
  34. 2 2
      master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml
  35. 2 2
      master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml
  36. 1 1
      master/src/main/resources/mybatis/pssr/TPssrRegionMapper.xml
  37. 2 2
      master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml
  38. 2 2
      master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml
  39. 2 2
      master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml
  40. 2 2
      master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml
  41. 2 2
      master/src/main/resources/mybatis/pssr/TPssrSubcontentMapper.xml
  42. 2 2
      master/src/main/resources/mybatis/pssr/TPssrTorchvocMapper.xml
  43. 1 1
      master/src/main/resources/mybatis/pssr/TPssrTurndownMapper.xml
  44. 2 2
      master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml

@@ -248,7 +248,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -270,7 +270,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml

@@ -160,7 +160,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml

@@ -135,7 +135,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -151,7 +151,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrContentModelMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrFileMapper.xml

@@ -107,7 +107,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where file_id = #{fileId}
     </update>

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml

@@ -241,7 +241,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -260,7 +260,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrFranklinismMapper.xml

@@ -138,7 +138,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -157,7 +157,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
         </trim>
         where id in

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml

@@ -138,7 +138,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -156,7 +156,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrHygieneMapper.xml

@@ -120,7 +120,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -136,7 +136,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -161,7 +161,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrInstrumentTestMapper.xml

@@ -101,7 +101,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -115,7 +115,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml

@@ -135,7 +135,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -151,7 +151,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrLightingMapper.xml

@@ -142,7 +142,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -162,7 +162,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
         </trim>
         where id in

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml

@@ -190,7 +190,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -211,7 +211,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrMaterialMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id in

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml

@@ -154,7 +154,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -170,7 +170,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrMeasureMapper.xml

@@ -144,7 +144,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -163,7 +163,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml

@@ -140,7 +140,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -156,7 +156,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml

@@ -138,7 +138,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -156,7 +156,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -161,7 +161,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -170,7 +170,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrOverhaulPipeMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrOverhaulPumpMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml

@@ -188,7 +188,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -203,7 +203,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrPatrolMapper.xml

@@ -118,7 +118,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -133,7 +133,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml

@@ -165,7 +165,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -189,7 +189,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
             <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrPowerMapper.xml

@@ -118,7 +118,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -136,7 +136,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrProgrammeMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -155,7 +155,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml

@@ -135,7 +135,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -151,7 +151,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrPublicMapper.xml

@@ -138,7 +138,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -156,7 +156,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml

@@ -171,7 +171,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml

@@ -140,7 +140,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
@@ -157,7 +157,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrRegionMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id = #{id}
     </update>

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -197,7 +197,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -215,7 +215,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml

@@ -170,7 +170,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml

@@ -170,7 +170,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -169,7 +169,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrSubcontentMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrTorchvocMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -152,7 +152,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
         </trim>
         where id in

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrTurndownMapper.xml

@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id = #{id}
     </update>

+ 2 - 2
master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml

@@ -143,7 +143,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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">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>
@@ -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">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">