用户

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -86,6 +86,11 @@ public class SysDept extends BaseEntity {
     private String tenantId;
 
     /**
+     * 钉钉部门id
+     */
+    private Long dingDeptId;
+
+    /**
      * 父部门名称
      */
     @TableField(exist = false)
@@ -223,6 +228,14 @@ public class SysDept extends BaseEntity {
         this.type = type;
     }
 
+    public Long getDingDeptId() {
+        return dingDeptId;
+    }
+
+    public void setDingDeptId(Long dingDeptId) {
+        this.dingDeptId = dingDeptId;
+    }
+
     @Override
     public String toString() {
         return "SysDept{" +
@@ -239,9 +252,9 @@ public class SysDept extends BaseEntity {
                 ", status='" + status + '\'' +
                 ", delFlag='" + delFlag + '\'' +
                 ", tenantId='" + tenantId + '\'' +
+                ", dingDeptId=" + dingDeptId +
                 ", parentName='" + parentName + '\'' +
                 ", children=" + children +
                 '}';
     }
-
 }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -135,6 +135,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="keyword != null and keyword != ''">
 			AND (instr(u.nick_name,#{keyword}) or instr(u.user_name,#{keyword}))
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND instr(u.nick_name,#{nickName})
+		</if>
+		<if test="roleId != null">
+			AND u.user_id IN (select t.user_id from sys_user_role t where t.role_id = #{roleId})
+		</if>
+		<if test="jobNumber != null and jobNumber != ''">
+			AND instr(u.job_number,#{jobNumber})
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>