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 @@ AND t.PROCESS_NUM = #{q.processNum} + + AND t.CATEGORY = #{q.category} + AND u.REAL_NAME LIKE '%' || #{q.updateUserRealName} || '%' 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