增加工艺筛选字段

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/CommonController.java

@@ -97,9 +97,9 @@ public class CommonController extends BaseController {
 
     @GetMapping("/devProcess")
     @ApiOperation(value = "getEmsTag", notes = "维表-查询标签列表")
-    public AjaxResult getDevProcess()
+    public AjaxResult getDevProcess(DevProcess devProcess)
     {
-        List<DevProcess> list =  processService.selectDevProcessList(new DevProcess());
+        List<DevProcess> list =  processService.selectDevProcessList(devProcess);
         return success(list);
     }
 }

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/DevProcessMapper.xml

@@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="psCode != null  and psCode != ''"> and ps_code = #{psCode}</if>
             <if test="psName != null  and psName != ''"> and ps_name like concat('%', #{psName}, '%')</if>
+            <if test="categoryCode != null  and categoryCode != ''"> and category_code = #{categoryCode}</if>
+            <if test="subcategoryCode != null  and subcategoryCode != ''"> and subcategory_code = #{subcategoryCode}</if>
         </where>
     </select>