From 11dd2f3efd559c68c06b2b5e77d9751e03c997b4 Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Fri, 27 Mar 2026 11:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E7=89=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/InspectionTemplateController.java |  4 ++--
 .../quality/mapper/InspectionTemplateMapper.xml  |  3 +++
 .../service/impl/WorkPlanItemServiceImpl.java    | 16 ++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java
index 25d0cab2..9a6acbf2 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java
+++ b/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));
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.xml
index 69734c1e..52e09e9a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.xml
+++ b/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>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
index 011b4cbe..5d9f4295 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
+++ b/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()) ||