查询修改

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmBorrowApplicationDao.xml

@@ -52,7 +52,7 @@
                 AND ba.applicant_name LIKE CONCAT('%', #{params.params.applicant_name}, '%')
             </if>
             <if test="params.params.department_name != null and params.params.department_name != ''">
-                AND u.department_name LIKE CONCAT('%', #{params.params.department_name}, '%')
+                AND so.name LIKE CONCAT('%', #{params.params.department_name}, '%')
             </if>
             <if test="params.params.approval_status != null">
                 AND ba.approval_status = #{params.params.approval_status}

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmUserCategoryDao.xml

@@ -736,6 +736,7 @@
         SELECT
         ba.department_id,
         ba.department_name,
+        ad.material_code,
         ad.material_id,
         ad.material_name,
         sum(ad.apply_quantity)-sum(ad.returned_quantity) as total_quantity
@@ -753,8 +754,11 @@
             <if test="end != null and end != ''">
                 AND ba.create_time &lt;= #{end}
             </if>
-            <if test="material != null and material != ''">
-                AND (ad.material_name LIKE CONCAT('%', #{material}, '%') OR ad.material_code LIKE CONCAT('%', #{material}, '%'))
+            <if test="material_name != null and material_name != ''">
+                AND ad.material_name LIKE CONCAT('%', #{material_name}, '%')
+            </if>
+            <if test="material_code != null and material_code != ''">
+                and ad.material_code LIKE CONCAT('%', #{material_code}, '%')
             </if>
             <if test="dep != null and dep != ''">
                 AND ad.department_name LIKE CONCAT('%', #{dep}, '%')