Sfoglia il codice sorgente

人员管理表添加leader信息

zhaoxian 4 anni fa
parent
commit
43cc8b0e83

+ 29 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -103,6 +103,8 @@ public class SysUserController {
     @Autowired
     private ISysRoleService roleService;
 
+    @Resource
+    private UserCompanyMapper userCompanyMapper;
     @Autowired
     private RedisUtil redisUtil;
     @Value("${jeecg.path.upload}")
@@ -118,14 +120,22 @@ public class SysUserController {
     public Map<String, Object> getAllDesigner() {
         Map<String, Object> map = new HashMap<>();
         List<SysUser> userList = sysUserService.getAllDesigner();
-        map.put("data",userList);
+        map.put("data", userList);
         ResultMapUtils.setResultMap(map, StatusCode.COMMON_SUCCESS);
         return map;
     }
 
+    @RequestMapping(value = "/getAllUser", method = RequestMethod.GET)
+    public Result<Object> getAllUser() {
+        try {
+            List<SysUserVo> allUser = sysUserService.getAllUser(null);
+            return Result.ok(allUser);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.error("查询失败");
+    }
 
-    @Resource
-    private UserCompanyMapper userCompanyMapper;
 
     /**
      * 获取用户列表数据
@@ -138,6 +148,21 @@ public class SysUserController {
      */
     @PermissionData(pageComponent = "system/UserList")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public Result<Object> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        try {
+            PageHelper.startPage(pageNo, pageSize);
+            List<SysUser> list = sysUserService.queryPageList(user);
+            PageInfo<SysUser> pageInfo = new PageInfo<>(list);
+            return Result.ok(pageInfo);
+        } catch (Exception e) {
+            log.error("获取用户列表数据-分页列表查询异常", e);
+        }
+        return Result.error("查询失败");
+    }
+
+   /* @PermissionData(pageComponent = "system/UserList")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         Result<IPage<SysUser>> result = new Result<>();
@@ -161,7 +186,7 @@ public class SysUserController {
         result.setResult(pageList);
         log.info(pageList.toString());
         return result;
-    }
+    }*/
 
     @RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
     public Result<List<SysUserVo>> getAllUserListByCompany(String userName) {

+ 9 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/SysDepart.java

@@ -83,6 +83,15 @@ public class SysDepart implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
+	/**
+	 * 领导 ID
+	 */
+	private String leaderId;
+
+	/**
+	 * 领导姓名
+	 */
+	private String leaderName;
 
 	/**
 	 * 重写equals方法

+ 18 - 1
module-common/src/main/java/cn/com/ctop/common/module/entity/SysUser.java

@@ -199,8 +199,25 @@ public class SysUser implements Serializable {
     private String depart;
 
     /**
-     * 部门
+     * 角色
      */
     @TableField(exist = false)
     private String roleName;
+
+    /**
+     * 组织机构名称
+     */
+    @TableField(exist = false)
+    private String departName;
+
+    /**
+     * 领导 ID
+     */
+    private String leaderId;
+
+    /**
+     * 领导姓名
+     */
+    private String leaderName;
+
 }

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java

@@ -172,4 +172,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     JSONObject selectUserByAccount(@Param("accountId") Long accountId);
 
     SysUser getDesignerTeamLeaderBy(@Param("orgCode")String orgCode);
+
+    List<SysUser> queryPageList(SysUser user);
 }

+ 38 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml

@@ -271,4 +271,42 @@ SELECT
         AND
             role.role_code = 'designTeamLeader'
     </select>
+
+    <select id="queryPageList" resultType="cn.com.ctop.common.module.entity.SysUser">
+        SELECT t1.*,t3.depart_name ,role.role_name
+        FROM sys_user t1
+        LEFT JOIN sys_user_depart t2 ON t1.id = t2.user_id
+        LEFT JOIN sys_depart t3 ON t2.dep_id = t3.id
+        LEFT JOIN sys_user_role userRole ON t1.id = userRole.user_id
+        LEFT JOIN sys_role role ON userRole.role_id = role.id
+        where 1=1
+        <if test="realname != null and realname != ''">
+            AND t1.realname LIKE CONCAT(CONCAT('%',#{realname}),'%')
+        </if>
+        <if test="username != null and username != ''">
+            AND t1.username LIKE CONCAT(CONCAT('%',#{username}),'%')
+        </if>
+        <if test="email != null and email != ''">
+            AND t1.email LIKE CONCAT(CONCAT('%',#{email}),'%')
+        </if>
+        <if test="phone != null and phone != ''">
+            AND t1.phone LIKE CONCAT(CONCAT('%',#{phone}),'%')
+        </if>
+        <if test="status != null and status != ''">
+            AND t1.`status` = #{status}
+        </if>
+        <if test="leaderName != null and leaderName != ''">
+            AND t1.leader_name LIKE CONCAT(CONCAT('%',#{leaderName}),'%')
+        </if>
+        <if test="departName != null and departName != ''">
+            AND t3.depart_name LIKE CONCAT(CONCAT('%',#{departName}),'%')
+        </if>
+        <if test="roleName != null and roleName != ''">
+            AND role.role_name LIKE CONCAT(CONCAT('%',#{roleName}),'%')
+        </if>
+        <if test="sex != null and sex != ''">
+            AND t1.sex =#{sex}
+        </if>
+    </select>
+
 </mapper>

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/ISysUserService.java

@@ -264,4 +264,6 @@ public interface ISysUserService extends IService<SysUser> {
     List<SysUser> getAllDesigner();
 
     SysUser getDesignerTeamLeaderBy(String orgCode);
+
+    List<SysUser> queryPageList(SysUser user);
 }

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysUserServiceImpl.java

@@ -283,6 +283,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
+    public List<SysUser> queryPageList(SysUser user) {
+        return userMapper.queryPageList(user);
+    }
+
+    @Override
     public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
         List<SysUserDepVo> list = this.baseMapper.getDepNamesByUserIds(userIds);
         Map<String, String> res = new HashMap<String, String>();