Просмотр исходного кода

update 优化 将部门管理 负责人选项改为下拉框选择

疯狂的狮子Li 2 лет назад
Родитель
Сommit
022d5fc084

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

@@ -6,6 +6,7 @@ import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.R;
@@ -265,4 +266,13 @@ public class SysUserController extends BaseController {
         return R.ok(deptService.selectDeptTreeList(dept));
         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));
+    }
+
 }
 }

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

@@ -48,7 +48,7 @@ public class SysDept extends TenantEntity {
     /**
     /**
      * 负责人
      * 负责人
      */
      */
-    private String leader;
+    private Long leader;
 
 
     /**
     /**
      * 联系电话
      * 联系电话

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

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

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

@@ -57,11 +57,16 @@ public class SysDeptVo implements Serializable {
      */
      */
     private Integer orderNum;
     private Integer orderNum;
 
 
+    /**
+     * 负责人ID
+     */
+    private Long leader;
+
     /**
     /**
      * 负责人
      * 负责人
      */
      */
     @ExcelProperty(value = "负责人")
     @ExcelProperty(value = "负责人")
-    private String leader;
+    private String leaderName;
 
 
     /**
     /**
      * 联系电话
      * 联系电话

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java

@@ -92,8 +92,8 @@ public class SysUserExportVo implements Serializable {
     /**
     /**
      * 负责人
      * 负责人
      */
      */
-    @ReverseAutoMapping(target = "leader", source = "dept.leader")
+    @ReverseAutoMapping(target = "leaderName", source = "dept.leaderName")
     @ExcelProperty(value = "部门负责人")
     @ExcelProperty(value = "部门负责人")
-    private String leader;
+    private String leaderName;
 
 
 }
 }

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

@@ -210,4 +210,12 @@ public interface ISysUserService {
      */
      */
     String selectUserNameById(Long userId);
     String selectUserNameById(Long userId);
 
 
+    /**
+     * 通过部门id查询当前部门所有用户
+     *
+     * @param deptId
+     * @return
+     */
+    List<SysUserVo> selectUserListByDept(Long deptId);
+
 }
 }

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

@@ -132,7 +132,6 @@ public class SysTenantServiceImpl implements ISysTenantService {
         SysDept dept = new SysDept();
         SysDept dept = new SysDept();
         dept.setTenantId(tenantId);
         dept.setTenantId(tenantId);
         dept.setDeptName(bo.getCompanyName());
         dept.setDeptName(bo.getCompanyName());
-        dept.setLeader(bo.getUsername());
         dept.setParentId(Constants.TOP_PARENT_ID);
         dept.setParentId(Constants.TOP_PARENT_ID);
         dept.setAncestors(Constants.TOP_PARENT_ID.toString());
         dept.setAncestors(Constants.TOP_PARENT_ID.toString());
         deptMapper.insert(dept);
         deptMapper.insert(dept);
@@ -152,6 +151,11 @@ public class SysTenantServiceImpl implements ISysTenantService {
         user.setPassword(BCrypt.hashpw(bo.getPassword()));
         user.setPassword(BCrypt.hashpw(bo.getPassword()));
         user.setDeptId(deptId);
         user.setDeptId(deptId);
         userMapper.insert(user);
         userMapper.insert(user);
+        //新增系统用户后,默认当前用户为部门的负责人
+        SysDept sd = new SysDept();
+        sd.setLeader(user.getUserId());
+        sd.setDeptId(deptId);
+        deptMapper.updateById(sd);
 
 
         // 用户和角色关联表
         // 用户和角色关联表
         SysUserRole userRole = new SysUserRole();
         SysUserRole userRole = new SysUserRole();

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

@@ -513,6 +513,19 @@ public class SysUserServiceImpl implements ISysUserService {
         return flag;
         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")
     @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")
     @Override
     @Override
     public String selectUserNameById(Long userId) {
     public String selectUserNameById(Long userId) {

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

@@ -65,18 +65,22 @@
 
 
     <select id="selectPageUserList" resultMap="SysUserResult">
     <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,
         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
+               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
         from sys_user u
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user u1 on u1.user_id = d.leader
+            ${ew.getCustomSqlSegment}
     </select>
     </select>
 
 
     <select id="selectUserList" resultMap="SysUserResult">
     <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,
         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
+               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
         from sys_user u
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user u1 on u1.user_id = d.leader
+            ${ew.getCustomSqlSegment}
     </select>
     </select>
 
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
     <select id="selectAllocatedList" resultMap="SysUserResult">

+ 25 - 25
sql/oracle/oracle_ry_cloud.sql

@@ -3,8 +3,8 @@
 -- ----------------------------
 -- ----------------------------
 create table sys_social
 create table sys_social
 (
 (
-    id                 number(20)       not null,
-    user_id            number(20)       not null,
+    id                 number(20)        not null,
+    user_id            number(20)        not null,
     tenant_id          varchar2(20)      default null,
     tenant_id          varchar2(20)      default null,
     auth_id            varchar2(255)     not null,
     auth_id            varchar2(255)     not null,
     source             varchar2(255)     not null,
     source             varchar2(255)     not null,
@@ -14,7 +14,7 @@ create table sys_social
     email              varchar2(255)     default '',
     email              varchar2(255)     default '',
     avatar             varchar2(500)     default '',
     avatar             varchar2(500)     default '',
     access_token       varchar2(255)     not null,
     access_token       varchar2(255)     not null,
-    expire_in          number(100)      default null,
+    expire_in          number(100)       default null,
     refresh_token      varchar2(255)     default null,
     refresh_token      varchar2(255)     default null,
     access_code        varchar2(255)     default null,
     access_code        varchar2(255)     default null,
     union_id           varchar2(255)     default null,
     union_id           varchar2(255)     default null,
@@ -166,7 +166,7 @@ create table sys_dept (
   ancestors         varchar2(500)   default '',
   ancestors         varchar2(500)   default '',
   dept_name         varchar2(30)    default '',
   dept_name         varchar2(30)    default '',
   order_num         number(4)       default 0,
   order_num         number(4)       default 0,
-  leader            varchar2(20)    default null,
+  leader            number(20)      default null,
   phone             varchar2(11)    default null,
   phone             varchar2(11)    default null,
   email             varchar2(50)    default null,
   email             varchar2(50)    default null,
   status            char(1)         default '0',
   status            char(1)         default '0',
@@ -201,16 +201,16 @@ comment on column sys_dept.update_time  is '更新时间';
 -- ----------------------------
 -- ----------------------------
 -- 初始化-部门表数据
 -- 初始化-部门表数据
 -- ----------------------------
 -- ----------------------------
-insert into sys_dept values(100, '000000', 0,   '0',          'XXX科技',   0, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(101, '000000', 100, '0,100',      '深圳总公司', 1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(102, '000000', 100, '0,100',      '长沙分公司', 2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(103, '000000', 101, '0,100,101',  '研发部门',   1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(104, '000000', 101, '0,100,101',  '市场部门',   2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(105, '000000', 101, '0,100,101',  '测试部门',   3, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(106, '000000', 101, '0,100,101',  '财务部门',   4, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(107, '000000', 101, '0,100,101',  '运维部门',   5, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(108, '000000', 102, '0,100,102',  '市场部门',   1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(109, '000000', 102, '0,100,102',  '财务部门',   2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(100, '000000', 0,   '0',          'XXX科技',   0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(101, '000000', 100, '0,100',      '深圳总公司', 1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(102, '000000', 100, '0,100',      '长沙分公司', 2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(103, '000000', 101, '0,100,101',  '研发部门',   1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(104, '000000', 101, '0,100,101',  '市场部门',   2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(105, '000000', 101, '0,100,101',  '测试部门',   3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(106, '000000', 101, '0,100,101',  '财务部门',   4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(107, '000000', 101, '0,100,101',  '运维部门',   5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(108, '000000', 102, '0,100,102',  '市场部门',   1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(109, '000000', 102, '0,100,102',  '财务部门',   2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
 
 
 
 
 -- ----------------------------
 -- ----------------------------
@@ -1071,9 +1071,9 @@ create table gen_table_column (
   dict_type         varchar(200)    default '',
   dict_type         varchar(200)    default '',
   sort              number(4),
   sort              number(4),
   create_dept       number(20)      default null,
   create_dept       number(20)      default null,
-  create_by         number(20)       default null,
+  create_by         number(20)      default null,
   create_time       date ,
   create_time       date ,
-  update_by         number(20)       default null,
+  update_by         number(20)      default null,
   update_time       date
   update_time       date
 );
 );
 
 
@@ -1201,22 +1201,22 @@ insert into sys_oss_config values (5, '000000', 'image',  'ruoyi',            'r
 -- 系统授权表
 -- 系统授权表
 -- ----------------------------
 -- ----------------------------
 create table sys_client (
 create table sys_client (
-    id                  number(20)    not null,
+    id                  number(20)     not null,
     client_id           varchar2(64)   default null,
     client_id           varchar2(64)   default null,
     client_key          varchar2(32)   default null,
     client_key          varchar2(32)   default null,
     client_secret       varchar2(255)  default null,
     client_secret       varchar2(255)  default null,
     grant_type          varchar2(255)  default null,
     grant_type          varchar2(255)  default null,
     device_type         varchar2(32)   default null,
     device_type         varchar2(32)   default null,
-    active_timeout      number(11)    default 1800,
-    timeout             number(11)    default 604800,
-    status              char(1)       default '0',
-    del_flag            char(1)       default '0',
-    create_dept         number(20)    default null,
-    create_by           number(20)    default null,
+    active_timeout      number(11)     default 1800,
+    timeout             number(11)     default 604800,
+    status              char(1)        default '0',
+    del_flag            char(1)        default '0',
+    create_dept         number(20)     default null,
+    create_by           number(20)     default null,
     create_time         date,
     create_time         date,
-    update_by           number(20)    default null,
+    update_by           number(20)     default null,
     update_time         date
     update_time         date
-)
+);
 
 
 alter table sys_client add constraint pk_sys_client primary key (id);
 alter table sys_client add constraint pk_sys_client primary key (id);
 
 

+ 11 - 11
sql/postgres/postgres_ry_cloud.sql

@@ -173,7 +173,7 @@ create table if not exists sys_dept
     ancestors   varchar(500)default ''::varchar,
     ancestors   varchar(500)default ''::varchar,
     dept_name   varchar(30) default ''::varchar,
     dept_name   varchar(30) default ''::varchar,
     order_num   int4        default 0,
     order_num   int4        default 0,
-    leader      varchar(20) default null::varchar,
+    leader      int8        default null::varchar,
     phone       varchar(11) default null::varchar,
     phone       varchar(11) default null::varchar,
     email       varchar(50) default null::varchar,
     email       varchar(50) default null::varchar,
     status      char        default '0'::bpchar,
     status      char        default '0'::bpchar,
@@ -207,16 +207,16 @@ comment on column sys_dept.update_time  is '更新时间';
 -- ----------------------------
 -- ----------------------------
 -- 初始化-部门表数据
 -- 初始化-部门表数据
 -- ----------------------------
 -- ----------------------------
-insert into sys_dept values(100, '000000', 0,   '0',          'XXX科技',   0, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(101, '000000', 100, '0,100',      '深圳总公司', 1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(102, '000000', 100, '0,100',      '长沙分公司', 2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(103, '000000', 101, '0,100,101',  '研发部门',   1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(104, '000000', 101, '0,100,101',  '市场部门',   2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(105, '000000', 101, '0,100,101',  '测试部门',   3, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(106, '000000', 101, '0,100,101',  '财务部门',   4, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(107, '000000', 101, '0,100,101',  '运维部门',   5, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(108, '000000', 102, '0,100,102',  '市场部门',   1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
-insert into sys_dept values(109, '000000', 102, '0,100,102',  '财务部门',   2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(100, '000000', 0,   '0',          'XXX科技',   0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(101, '000000', 100, '0,100',      '深圳总公司', 1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(102, '000000', 100, '0,100',      '长沙分公司', 2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(103, '000000', 101, '0,100,101',  '研发部门',   1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(104, '000000', 101, '0,100,101',  '市场部门',   2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(105, '000000', 101, '0,100,101',  '测试部门',   3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(106, '000000', 101, '0,100,101',  '财务部门',   4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(107, '000000', 101, '0,100,101',  '运维部门',   5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(108, '000000', 102, '0,100,102',  '市场部门',   1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(109, '000000', 102, '0,100,102',  '财务部门',   2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
 
 
 -- ----------------------------
 -- ----------------------------
 -- 2、用户信息表
 -- 2、用户信息表

+ 11 - 11
sql/ry-cloud.sql

@@ -105,7 +105,7 @@ create table sys_dept (
   ancestors         varchar(500)    default ''                 comment '祖级列表',
   ancestors         varchar(500)    default ''                 comment '祖级列表',
   dept_name         varchar(30)     default ''                 comment '部门名称',
   dept_name         varchar(30)     default ''                 comment '部门名称',
   order_num         int(4)          default 0                  comment '显示顺序',
   order_num         int(4)          default 0                  comment '显示顺序',
-  leader            varchar(20)     default null               comment '负责人',
+  leader            bigint(20)      default null               comment '负责人',
   phone             varchar(11)     default null               comment '联系电话',
   phone             varchar(11)     default null               comment '联系电话',
   email             varchar(50)     default null               comment '邮箱',
   email             varchar(50)     default null               comment '邮箱',
   status            char(1)         default '0'                comment '部门状态(0正常 1停用)',
   status            char(1)         default '0'                comment '部门状态(0正常 1停用)',
@@ -123,16 +123,16 @@ create table sys_dept (
 -- ----------------------------
 -- ----------------------------
 
 
 
 
-insert into sys_dept values(100, '000000', 0,   '0',          'XXX科技',   0, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(101, '000000', 100, '0,100',      '深圳总公司', 1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(102, '000000', 100, '0,100',      '长沙分公司', 2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(103, '000000', 101, '0,100,101',  '研发部门',   1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(104, '000000', 101, '0,100,101',  '市场部门',   2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(105, '000000', 101, '0,100,101',  '测试部门',   3, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(106, '000000', 101, '0,100,101',  '财务部门',   4, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(107, '000000', 101, '0,100,101',  '运维部门',   5, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(108, '000000', 102, '0,100,102',  '市场部门',   1, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
-insert into sys_dept values(109, '000000', 102, '0,100,102',  '财务部门',   2, '疯狂的狮子Li', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(100, '000000', 0,   '0',          'XXX科技',   0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(101, '000000', 100, '0,100',      '深圳总公司', 1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(102, '000000', 100, '0,100',      '长沙分公司', 2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(103, '000000', 101, '0,100,101',  '研发部门',   1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(104, '000000', 101, '0,100,101',  '市场部门',   2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(105, '000000', 101, '0,100,101',  '测试部门',   3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(106, '000000', 101, '0,100,101',  '财务部门',   4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(107, '000000', 101, '0,100,101',  '运维部门',   5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(108, '000000', 102, '0,100,102',  '市场部门',   1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(109, '000000', 102, '0,100,102',  '财务部门',   2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
 
 
 
 
 -- ----------------------------
 -- ----------------------------

+ 5 - 2
sql/update/oracle/update_2.0-2.1.sql

@@ -16,7 +16,7 @@ create table sys_social
     email              varchar2(255)     default '',
     email              varchar2(255)     default '',
     avatar             varchar2(500)     default '',
     avatar             varchar2(500)     default '',
     access_token       varchar2(255)     not null,
     access_token       varchar2(255)     not null,
-    expire_in          number(100)      default null,
+    expire_in          number(20)        default null,
     refresh_token      varchar2(255)     default null,
     refresh_token      varchar2(255)     default null,
     access_code        varchar2(255)     default null,
     access_code        varchar2(255)     default null,
     union_id           varchar2(255)     default null,
     union_id           varchar2(255)     default null,
@@ -89,7 +89,7 @@ create table sys_client (
     create_time         date,
     create_time         date,
     update_by           number(20)    default null,
     update_by           number(20)    default null,
     update_time         date
     update_time         date
-)
+);
 
 
 alter table sys_client add constraint pk_sys_client primary key (id);
 alter table sys_client add constraint pk_sys_client primary key (id);
 
 
@@ -141,3 +141,6 @@ insert into sys_role_menu values ('2', '1062');
 insert into sys_role_menu values ('2', '1063');
 insert into sys_role_menu values ('2', '1063');
 insert into sys_role_menu values ('2', '1064');
 insert into sys_role_menu values ('2', '1064');
 insert into sys_role_menu values ('2', '1065');
 insert into sys_role_menu values ('2', '1065');
+
+update sys_dept set leader = null;
+ALTER TABLE sys_dept MODIFY (leader NUMBER(20))

+ 3 - 0
sql/update/postgres/update_2.0-2.1.sql

@@ -140,3 +140,6 @@ insert into sys_role_menu values ('2', '1062');
 insert into sys_role_menu values ('2', '1063');
 insert into sys_role_menu values ('2', '1063');
 insert into sys_role_menu values ('2', '1064');
 insert into sys_role_menu values ('2', '1064');
 insert into sys_role_menu values ('2', '1065');
 insert into sys_role_menu values ('2', '1065');
+
+update sys_dept set leader = null;
+ALTER TABLE sys_dept ALTER COLUMN leader TYPE int8;

+ 4 - 0
sql/update/update_2.0-2.1.sql

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