限制空间、盲板抽堵word ppt优化

master/src/main/java/com/ruoyi/project/ticket/controller/TPermitBlindPlateController.java

@@ -258,18 +258,18 @@ public class TPermitBlindPlateController extends BaseController
         getCheck(params, tPermitBlindPlate.geteIsSafeGoggles(), "eIsSafeGoggles", "eIsSafeGoggles2");
         getCheck(params, tPermitBlindPlate.geteIsFaceShield(), "eIsFaceShield", "eIsFaceShield2");
         getCheck(params, tPermitBlindPlate.geteIsProtectGloves(), "eIsProtectGloves", "eIsProtectGloves2");
-        if (tPermitBlindPlate.geteProtectGlovesContent() != null) {
+        if (tPermitBlindPlate.geteProtectGlovesContent() != null && !"0".equals(tPermitBlindPlate.geteProtectGlovesContent())) {
             params.put("eProtectGlovesContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tPermitBlindPlate.geteProtectGlovesContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
         }
         getCheck(params, tPermitBlindPlate.geteIsRubberBoots(), "eIsRubberBoots", "eIsRubberBoots2");
         getCheck(params, tPermitBlindPlate.geteIsRubberApron(), "eIsRubberApron", "eIsRubberApron2");
         getCheck(params, tPermitBlindPlate.geteIsProtectSuit(), "eIsProtectSuit", "eIsProtectSuit2");
-        if (tPermitBlindPlate.geteProtectSuitContent() != null) {
+        if (tPermitBlindPlate.geteProtectSuitContent() != null && !"0".equals(tPermitBlindPlate.geteProtectSuitContent())) {
             params.put("eProtectSuitContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tPermitBlindPlate.geteProtectSuitContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
         }
         //2.7是否呼吸保护用品
         getCheck(params, tPermitBlindPlate.geteIsResProtect(), "eIsResProtect", "eIsResProtect2");
-        if (tPermitBlindPlate.geteResProtectContent() != null) {
+        if (tPermitBlindPlate.geteResProtectContent() != null && !"0".equals(tPermitBlindPlate.geteResProtectContent())) {
             params.put("eResProtectContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tPermitBlindPlate.geteResProtectContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
         }
         //2.8

master/src/main/java/com/ruoyi/project/ticket/controller/TRestrictedSpacePermitController.java

@@ -255,18 +255,18 @@ public class TRestrictedSpacePermitController extends BaseController
         getCheck(params, tRestrictedSpacePermit.geteIsSafeGoggles(), "eIsSafeGoggles", "eIsSafeGoggles2");
         getCheck(params, tRestrictedSpacePermit.geteIsFaceShield(), "eIsFaceShield", "eIsFaceShield2");
         getCheck(params, tRestrictedSpacePermit.geteIsProtectGloves(), "eIsProtectGloves", "eIsProtectGloves2");
-        if (tRestrictedSpacePermit.geteProtectGlovesContent() != null) {
+        if (tRestrictedSpacePermit.geteProtectGlovesContent() != null && !"0".equals(tRestrictedSpacePermit.geteProtectGlovesContent())) {
             params.put("eProtectGlovesContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tRestrictedSpacePermit.geteProtectGlovesContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
         }
         getCheck(params, tRestrictedSpacePermit.geteIsRubberBoots(), "eIsRubberBoots", "eIsRubberBoots2");
         getCheck(params, tRestrictedSpacePermit.geteIsRubberApron(), "eIsRubberApron", "eIsRubberApron2");
         getCheck(params, tRestrictedSpacePermit.geteIsProtectSuit(), "eIsProtectSuit", "eIsProtectSuit2");
-        if (tRestrictedSpacePermit.geteProtectSuitContent() != null) {
+        if (tRestrictedSpacePermit.geteProtectSuitContent() != null && !"0".equals(tRestrictedSpacePermit.geteProtectSuitContent())) {
             params.put("eProtectSuitContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tRestrictedSpacePermit.geteProtectSuitContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
         }
         //2.7是否呼吸保护用品
         getCheck(params, tRestrictedSpacePermit.geteIsResProtect(), "eIsResProtect", "eIsResProtect2");
-        if (tRestrictedSpacePermit.geteResProtectContent() != null) {
+        if (tRestrictedSpacePermit.geteResProtectContent() != null && !"0".equals(tRestrictedSpacePermit.geteResProtectContent())) {
             params.put("eResProtectContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tRestrictedSpacePermit.geteResProtectContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
         }
         getCheck(params, tRestrictedSpacePermit.geteIsFallArrest(), "eIsFallArrest", "eIsFallArrest2");