后线人员增加领导人查询

src/main/java/com/ydtech/modules/admin/model/dto/SysUserDto.java

@@ -34,6 +34,9 @@ public class SysUserDto extends PageRequest {
     @ApiModelProperty("状态")
     private String status;
 
+    @ApiModelProperty("领导人")
+    private String leaderName;
+
     @ApiModelProperty("代理个代标识")
     private Integer agentFlag;
 }

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -159,6 +159,9 @@
             <if test='user.deptId !=null and user.deptId!=""  '>
                 and su.dept_id like concat('%',#{user.deptId},'%')
             </if>
+            <if test='user.leaderName !=null and user.leaderName!=""  '>
+                and su.leader_name like concat('%',#{user.leaderName},'%')
+            </if>
             <if test='user.roleId !=null and user.roleId!=""  '>
                 and t3.role_id in (${user.roleId})
             </if>
@@ -212,6 +215,9 @@
             <if test='user.deptId !=null and user.deptId!=""  '>
                 and su.dept_id like concat('%',#{user.deptId},'%')
             </if>
+            <if test='user.leaderName !=null and user.leaderName!=""  '>
+                and su.leader_name like concat('%',#{user.leaderName},'%')
+            </if>
             <if test="user.agentFlag !=null and user.agentFlag != 0 ">
                 and sd.management_source = #{user.agentFlag}
             </if>
@@ -391,11 +397,8 @@
         RIGHT JOIN ins_area_company iac ON iac.orderno = io.orderno
         WHERE
         iac.orderstatus IN ( 1, 2, 3 )
-        <if test="quUserNumDto.createTimeStart != null">
-            and io.createtime &gt;= #{quUserNumDto.createTimeStart}
-        </if>
-        <if test="quUserNumDto.createTimeEnd != null">
-            and io.createtime &lt;= #{quUserNumDto.createTimeEnd}
+        <if test="quUserNumDto.createTimeStart != null and quUserNumDto.createTimeEnd != null">
+            and io.createtime BETWEEN #{quUserNumDto.createTimeStart} AND #{quUserNumDto.createTimeEnd}
         </if>
         <if test="quUserNumDto.userIds != null">
             and io.userid IN
@@ -423,6 +426,9 @@
         RIGHT JOIN ins_area_company iac ON iac.orderno = io.orderno
         WHERE
         iac.orderstatus IN ( 1, 2, 3 )
+        <if test="quUserNumDto.createTimeStart != null and quUserNumDto.createTimeEnd != null">
+            and io.createtime BETWEEN #{quUserNumDto.createTimeStart} AND #{quUserNumDto.createTimeEnd}
+        </if>
         <if test="quUserNumDto.userIds != null">
             and io.userid IN
             <foreach collection="quUserNumDto.userIds" item="id" index="index" open="(" close=")" separator=",">