修改 xml

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectResourceMapper.xml

@@ -152,7 +152,7 @@
                  LEFT JOIN tz_ugp_project AS project ON project.sequence_nbr = resource.project_id
         <where>
             resource.type = #{type}
-             <if test="projectResourceDto !=null">
+             <if test="projectResourceDto != null">
             <if test="projectResourceDto.name !=null and projectResourceDto.name != ''">
                 and material.`name`   LIKE CONCAT("%",#{projectResourceDto.name},"%")
             </if>
@@ -160,7 +160,7 @@
                 and  project.`name` LIKE CONCAT("%",#{projectResourceDto.projectName},"%")
             </if>
              </if>
-            <if test="codes !=null">
+            <if test="codes !=null and codes.size > 0">
                 AND resource.project_id in
                 <foreach collection="codes" item = "item" index="index" open="(" separator="," close=")">
                     #{item}
@@ -185,7 +185,7 @@
         LEFT JOIN tz_ugp_project AS project ON project.sequence_nbr = resource.project_id
         LEFT JOIN tz_ugp_equipment AS equipment ON equipment.sequence_nbr = resource.resource_id
         <where>
-        <if test="type!=null">
+        <if test="type!=null and type!=''">
             resource.type = #{type}
         </if>
 
@@ -197,7 +197,7 @@
                     and project.`name` LIKE CONCAT("%",#{projectResourceDto.projectName},"%")
                 </if>
             </if>
-            <if test="codes !=null">
+            <if test="codes !=null and codes.size > 0">
                 AND resource.project_id in
                 <foreach collection="codes" item="item" index="index" open="(" separator="," close=")">
                     #{item}