ip任务端修改

ruoyi-admin/src/main/resources/mapper/UnitMapper.xml

@@ -182,8 +182,21 @@
         </choose>
         ) AS valid_nicknames ON a.nick_name = valid_nicknames.nick_name
         LEFT JOIN asset_task b ON FIND_IN_SET(a.nick_name, b.dwmc) AND b.task_status = 1
-        WHERE valid_nicknames.nick_name IS NOT NULL
-        AND b.dwmc IS NULL
+
+      <where>
+          <if test="req.nickName != null and req.nickName != '' ">
+              and valid_nicknames.nick_name like concat('%',#{req.nickName},'%')
+          </if>
+          <if test="req.dwlx != null">
+              and valid_nicknames.dwlx = #{req.dwlx}
+          </if>
+          <if test="req.userName != null and req.userName != '' ">
+              and valid_nicknames.user_name like concat('%',#{req.userName},'%')
+          </if>
+        and valid_nicknames.nick_name IS NOT NULL     AND b.dwmc IS NULL
+      </where>
+
+
     </select>
 
     <select id="selectAllUnit" resultType="com.ruoyi.tc.entity.Unit">