Pre Merge pull request !414 from David Wei/5.X

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -266,12 +266,4 @@ public class SysUserController extends BaseController {
         return R.ok(deptService.selectDeptTreeList(dept));
     }
 
-    /**
-     * 获取部门下的所有用户信息
-     */
-    @SaCheckPermission("system:user:list")
-    @GetMapping("/list/dept/{deptId}")
-    public R<List<SysUserVo>> listByDept(@PathVariable @NotNull Long deptId) {
-        return R.ok(userService.selectUserListByDept(deptId));
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java

@@ -1,8 +1,6 @@
 package org.dromara.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import org.dromara.common.tenant.core.TenantEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -47,7 +45,8 @@ public class SysDept extends TenantEntity {
     /**
      * 负责人
      */
-    private Long leader;
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private Long leaderId;
 
     /**
      * 联系电话

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java

@@ -50,7 +50,7 @@ public class SysDeptBo extends BaseEntity {
     /**
      * 负责人
      */
-    private Long leader;
+    private Long leaderId;
 
     /**
      * 联系电话

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java

@@ -60,7 +60,7 @@ public class SysDeptVo implements Serializable {
     /**
      * 负责人ID
      */
-    private Long leader;
+    private Long leaderId;
 
     /**
      * 负责人

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java

@@ -201,12 +201,5 @@ public interface ISysUserService {
      * @return 结果
      */
     int deleteUserByIds(Long[] userIds);
-
+    
-    /**
-     * 通过部门id查询当前部门所有用户
-     *
-     * @param deptId
-     * @return
-     */
-    List<SysUserVo> selectUserListByDept(Long deptId);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -153,7 +153,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
         userMapper.insert(user);
         //新增系统用户后，默认当前用户为部门的负责人
         SysDept sd = new SysDept();
-        sd.setLeader(user.getUserId());
+        sd.setLeaderId(user.getUserId());
         sd.setDeptId(deptId);
         deptMapper.updateById(sd);
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -513,19 +513,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return flag;
     }
 
-    /**
-     * 通过部门id查询当前部门所有用户
-     *
-     * @param deptId
-     * @return
-     */
-    @Override
-    public List<SysUserVo> selectUserListByDept(Long deptId) {
-        LambdaQueryWrapper<SysUser> lqw = Wrappers.lambdaQuery();
-        lqw.eq(SysUser::getDeptId, deptId);
-        return baseMapper.selectVoList(lqw);
-    }
-
     @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")
     @Override
     public String selectUserNameById(Long userId) {

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

@@ -49,7 +49,7 @@
                d.ancestors,
                d.dept_name,
                d.order_num,
-               d.leader,
+               d.leader_id,
                d.status as dept_status,
                d.email as dept_email,
                d.create_time as dept_cteate_time,
@@ -68,20 +68,20 @@
     <select id="selectPageUserList" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-            d.dept_name, d.leader, u1.user_name as leaderName
+            d.dept_name, d.leader_id, u1.user_name as leaderName
         from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
-            left join sys_user u1 on u1.user_id = d.leader
+            left join sys_user u1 on u1.user_id = d.leader_id
         ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUserList" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-            d.dept_name, d.leader, u1.user_name as leaderName
+            d.dept_name, d.leader_id, u1.user_name as leaderName
         from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
-            left join sys_user u1 on u1.user_id = d.leader
+            left join sys_user u1 on u1.user_id = d.leader_id
         ${ew.getCustomSqlSegment}
     </select>
 

script/sql/oracle/oracle_ry_vue_5.X.sql

@@ -166,7 +166,7 @@ create table sys_dept (
   ancestors         varchar2(500)   default '',
   dept_name         varchar2(30)    default '',
   order_num         number(4)       default 0,
-  leader            number(20)     default null,
+  leader_id         number(20)      default null,
   phone             varchar2(11)    default null,
   email             varchar2(50)    default null,
   status            char(1)         default '0',
@@ -187,7 +187,7 @@ comment on column sys_dept.parent_id    is '父部门id';
 comment on column sys_dept.ancestors    is '祖级列表';
 comment on column sys_dept.dept_name    is '部门名称';
 comment on column sys_dept.order_num    is '显示顺序';
-comment on column sys_dept.leader       is '负责人';
+comment on column sys_dept.leader_id    is '负责人';
 comment on column sys_dept.phone        is '联系电话';
 comment on column sys_dept.email        is '邮箱';
 comment on column sys_dept.status       is '部门状态（0正常 1停用）';

script/sql/postgres/postgres_ry_vue_5.X.sql

@@ -173,7 +173,7 @@ create table if not exists sys_dept
     ancestors   varchar(500)default ''::varchar,
     dept_name   varchar(30) default ''::varchar,
     order_num   int4        default 0,
-    leader      int8        default null,
+    leader_id   int8        default null,
     phone       varchar(11) default null::varchar,
     email       varchar(50) default null::varchar,
     status      char        default '0'::bpchar,
@@ -193,7 +193,7 @@ comment on column sys_dept.parent_id    is '父部门ID';
 comment on column sys_dept.ancestors    is '祖级列表';
 comment on column sys_dept.dept_name    is '部门名称';
 comment on column sys_dept.order_num    is '显示顺序';
-comment on column sys_dept.leader       is '负责人';
+comment on column sys_dept.leader_id    is '负责人';
 comment on column sys_dept.phone        is '联系电话';
 comment on column sys_dept.email        is '邮箱';
 comment on column sys_dept.status       is '部门状态（0正常 1停用）';

script/sql/ry_vue_5.X.sql

@@ -106,7 +106,7 @@ create table sys_dept (
     ancestors         varchar(500)    default ''                 comment '祖级列表',
     dept_name         varchar(30)     default ''                 comment '部门名称',
     order_num         int(4)          default 0                  comment '显示顺序',
-    leader            bigint(20)      default null               comment '负责人',
+    leader_id         bigint(20)      default null               comment '负责人',
     phone             varchar(11)     default null               comment '联系电话',
     email             varchar(50)     default null               comment '邮箱',
     status            char(1)         default '0'                comment '部门状态（0正常 1停用）',

script/sql/sqlserver/sqlserver_ry_vue_5.X.sql

@@ -928,7 +928,7 @@ CREATE TABLE sys_dept
     ancestors   nvarchar(500)DEFAULT ''    NULL,
     dept_name   nvarchar(30) DEFAULT ''    NULL,
     order_num   int          DEFAULT ((0)) NULL,
-    leader      bigint                     NULL,
+    leader_id   bigint                     NULL,
     phone       nvarchar(11)               NULL,
     email       nvarchar(50)               NULL,
     status      nchar(1)     DEFAULT ('0') NULL,
@@ -985,7 +985,7 @@ EXEC sys.sp_addextendedproperty
     'MS_Description', N'负责人' ,
     'SCHEMA', N'dbo',
     'TABLE', N'sys_dept',
-    'COLUMN', N'leader'
+    'COLUMN', N'leader_id'
 GO
 EXEC sys.sp_addextendedproperty
     'MS_Description', N'联系电话' ,

script/sql/update/oracle/update_5.0-5.1.sql

@@ -147,5 +147,5 @@ insert into sys_role_menu values ('2', '1064');
 insert into sys_role_menu values ('2', '1065');
 
 
-update sys_dept set leader = null;
+update sys_dept set leader_id = null;
-ALTER TABLE sys_dept MODIFY (leader NUMBER(20))
+ALTER TABLE sys_dept MODIFY (leader_id NUMBER(20))

script/sql/update/postgres/update_5.0-5.1.sql

@@ -146,5 +146,5 @@ insert into sys_role_menu values ('2', '1064');
 insert into sys_role_menu values ('2', '1065');
 
 
-update sys_dept set leader = null;
+update sys_dept set leader_id = null;
-ALTER TABLE sys_dept ALTER COLUMN leader TYPE int8;
+ALTER TABLE sys_dept ALTER COLUMN leader_id TYPE int8;

script/sql/update/sqlserver/update_5.0-5.1.sql

@@ -403,7 +403,7 @@ INSERT sys_role_menu VALUES (2, 1065)
 GO
 
 
-UPDATE sys_dept SET leader = null
+UPDATE sys_dept SET leader_id = null
 GO
-ALTER TABLE sys_dept ALTER COLUMN leader bigint NULL
+ALTER TABLE sys_dept ALTER COLUMN leader_id bigint NULL
 GO

script/sql/update/update_5.0-5.1.sql

@@ -97,5 +97,5 @@ insert into sys_role_menu values ('2', '1064');
 insert into sys_role_menu values ('2', '1065');
 
 
-update sys_dept set leader = null;
+update sys_dept set leader_id = null;
-alter table sys_dept modify column leader bigint null default null comment '负责人' after order_num;
+alter table sys_dept modify column leader_id bigint null default null comment '负责人' after order_num;