检验模版修改，生产质量非空判断

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java

@@ -112,8 +112,8 @@ public class InspectionTemplateController extends BladeController {
         if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) {
             search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME));
         }
-        if (map.containsKey(InspectionTemplate.COL_CATEGORY)) {
-            search.setCategory((String) map.get(InspectionTemplate.COL_CATEGORY));
+        if (map.containsKey("category")) {
+            search.setCategory((String) map.get("category"));
         }
         if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) {
             search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME));

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.xml

@@ -45,6 +45,9 @@
         <if test="q.processNum != null">
             AND t.PROCESS_NUM = #{q.processNum}
         </if>
+        <if test="q.category != null">
+            AND t.CATEGORY = #{q.category}
+        </if>
         <if test="q.updateUserRealName != null and q.updateUserRealName != ''">
             AND u.REAL_NAME LIKE '%' || #{q.updateUserRealName} || '%'
         </if>

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java

@@ -91,15 +91,19 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
         }
         {
             InspectionItem item = inspectionItemService.getById(vo.getItemId());
-            InspectionItemVO itemVO = InspectionItemWrapper.build().entityVO(item);
-            inspectionItemService.setVOValue(itemVO);
-            vo.setItem(itemVO);
+            if(item != null){
+                InspectionItemVO itemVO = InspectionItemWrapper.build().entityVO(item);
+                inspectionItemService.setVOValue(itemVO);
+                vo.setItem(itemVO);
+            }
         }
         {
             Standard standard = standardService.getById(vo.getStandardId());
-            StandardVO standardVO = StandardWrapper.build().entityVO(standard);
-            standardService.setVOValue(standardVO);
-            vo.setStandard(standardVO);
+            if(standard != null){
+                StandardVO standardVO = StandardWrapper.build().entityVO(standard);
+                standardService.setVOValue(standardVO);
+                vo.setStandard(standardVO);
+            }
         }
         if (vo.getItem() != null && vo.getItem().getSpecialType() != null) {
             if (InspectionItemConst.SPECIAL_TYPE_THICK.equals(vo.getItem().getSpecialType()) ||