提交

src/main/java/cn/ezhizao/project/business/auxiliaryProcess/controller/BizAuxiliaryProcessController.java

@@ -47,6 +47,14 @@ public class BizAuxiliaryProcessController extends BaseController
         List<BizAuxiliaryProcess> list = bizAuxiliaryProcessService.getList(bizAuxiliaryProcess);
         return getDataTable(list);
     }
+    @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:list')")
+    @GetMapping("/all")
+    public TableDataInfo allList(BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizAuxiliaryProcess);
+        List<BizAuxiliaryProcess> list = bizAuxiliaryProcessService.getList(bizAuxiliaryProcess);
+        return getDataTable(list);
+    }
 
     /**
      * 导出辅助工序列表

src/main/resources/mybatis/business/technologicalProcessDetailDrawing/BizTechnologicalProcessDetailDrawingMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="technologyVersion != null and technologyVersion !=''">AND product_version = #{technologyVersion}</if>
             <if test="processCode != null and processCode != 'undefined' and processCode != ''">AND process_code = #{processCode}</if>
             <if test="drawingName != null  and drawingName != ''"> AND drawing_name = #{drawingName}</if>
-            <if test="drawingNumber != null and drawingNumber != ''">AND  product_id IN (select id from biz_product where deleted = 0 and drawing_number  like concat('%', #{drawingNumber}, '%'))) </if>
+            <if test="drawingNumber != null and drawingNumber != ''">AND  product_id IN (select id from biz_product where deleted = 0 and drawing_number  like concat('%', #{drawingNumber}, '%')) </if>
             <if test="companyAlias != null and companyAlias != ''">AND  product_id IN (select id from biz_product where deleted = 0 and company_alias  like concat('%', #{companyAlias}, '%')) </if>
             <if test="specification != null and specification != ''">AND  product_id IN (select id from biz_product where deleted = 0 and specification  like concat('%', #{specification}, '%')) </if>
             <if test="description != null and description != ''">AND product_id IN (select id from biz_product where deleted = 0 and description like concat('%', #{description}, '%')) </if>