删除掉dep和user中的无效字段

script/sql/zfjd-refactoring-v1/012-移除表中所有行的记录都是null的字段.sql

@@ -1,5 +1,4 @@
 ALTER TABLE `sys_dept` DROP COLUMN `dept_category`;
-ALTER TABLE `sys_dept` DROP COLUMN `create_dept`;
 ALTER TABLE `sys_dept` DROP COLUMN `kingdee_org_id`;
 ALTER TABLE `sys_dept` DROP COLUMN `kingdee_org_parent_id`;
 ALTER TABLE `sys_dept` DROP COLUMN `tenant_code`;
@@ -21,7 +20,6 @@ ALTER TABLE `sys_dept` DROP COLUMN `unitSysType`;
 ALTER TABLE `sys_dept` DROP COLUMN `dwxtlbms`;
 ALTER TABLE `sys_dept` DROP COLUMN `unitLevelCode`;
 ALTER TABLE `sys_dept` DROP COLUMN `unitLevel`;
-ALTER TABLE `sys_user` DROP COLUMN `create_dept`;
 ALTER TABLE `sys_user` DROP COLUMN `kingdee_org_id`;
 ALTER TABLE `sys_user` DROP COLUMN `kingdee_user_id`;
 ALTER TABLE `sys_user` DROP COLUMN `tenant_code`;

script/sql/zfjd-refactoring-v1/1002-检查表中存在null字段.sql

@@ -2,7 +2,7 @@ SET GROUP_CONCAT_MAX_LEN = 1000000;
 
 -- 检查 sys_dept
 SELECT GROUP_CONCAT(
-           CONCAT('SELECT ''sys_dept'' AS table_name, ''', column_name, ''' AS column_name, ''', IFNULL(column_comment,''), ''' AS column_comment FROM dual WHERE (SELECT COUNT(`', column_name, '`) FROM `sys_dept`) = 0')
+           CONCAT('SELECT ''sys_dept'' AS table_name, ''', column_name, ''' AS column_name, ''', IFNULL(column_comment,''), ''' AS column_comment, ''ALTER TABLE `sys_dept` DROP COLUMN `', column_name, '`;'' AS drop_sql FROM dual WHERE (SELECT COUNT(`', column_name, '`) FROM `sys_dept`) = 0')
                SEPARATOR ' UNION ALL '
        ) INTO @sql_dept
 FROM information_schema.columns
@@ -10,7 +10,7 @@ WHERE table_schema = @schema_name AND table_name = 'sys_dept';
 
 -- 检查 sys_user
 SELECT GROUP_CONCAT(
-           CONCAT('SELECT ''sys_user'' AS table_name, ''', column_name, ''' AS column_name, ''', IFNULL(column_comment,''), ''' AS column_comment FROM dual WHERE (SELECT COUNT(`', column_name, '`) FROM `sys_user`) = 0')
+           CONCAT('SELECT ''sys_user'' AS table_name, ''', column_name, ''' AS column_name, ''', IFNULL(column_comment,''), ''' AS column_comment, ''ALTER TABLE `sys_user` DROP COLUMN `', column_name, '`;'' AS drop_sql FROM dual WHERE (SELECT COUNT(`', column_name, '`) FROM `sys_user`) = 0')
                SEPARATOR ' UNION ALL '
        ) INTO @sql_user
 FROM information_schema.columns

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

@@ -50,12 +50,6 @@ public class SysDept extends TenantEntity {
     @TableField("dept_name")
     private String deptName;
 
-    /**
-     * 部门类别编码
-     */
-    @TableField("dept_category")
-    private String deptCategory;
-
     /**
      * 显示顺序
      */
@@ -99,29 +93,6 @@ public class SysDept extends TenantEntity {
     @TableField("dept_type")
     private String deptType;
 
-    /**
-     * 金蝶原始组织结构id
-     */
-    @TableField("kingdee_org_id")
-    private String kingdeeOrgId;
-
-    /**
-     * 金蝶原始父组织id
-     */
-    @TableField("kingdee_org_parent_id")
-    private String kingdeeOrgParentId;
-
-    /**
-     * 所属租户
-     */
-    @TableField("tenant_code")
-    private String tenantCode;
-
-    /**
-     * 用户ID
-     */
-    @TableField("user_id")
-    private Long userId;
 
     /**
      * 组织层级
@@ -153,11 +124,6 @@ public class SysDept extends TenantEntity {
     @TableField("createAt")
     private String createAt;
 
-    /**
-     * 描述
-     */
-    @TableField("description")
-    private String description;
 
     /**
      * 作用点
@@ -165,11 +131,6 @@ public class SysDept extends TenantEntity {
     @TableField("effectOn")
     private String effectOn;
 
-    /**
-     * 父ID（同步用）
-     */
-    @TableField("parentId")
-    private String syncParentId;
 
     /**
      * 组织ID
@@ -267,23 +228,6 @@ public class SysDept extends TenantEntity {
     @TableField("zone")
     private Integer zone;
 
-    /**
-     * 机构简称
-     */
-    @TableField("simpleName")
-    private String simpleName;
-
-    /**
-     * 是否法定机构
-     */
-    @TableField("isStatutoryOrg")
-    private String isStatutoryOrg;
-
-    /**
-     * 是否生效
-     */
-    @TableField("isActive")
-    private String isActive;
 
     /**
      * 机构状态代码
@@ -297,35 +241,6 @@ public class SysDept extends TenantEntity {
     @TableField("unitStatus")
     private String unitStatus;
 
-    /**
-     * 机构类型
-     */
-    @TableField("unitType")
-    private String unitType;
-
-    /**
-     * 行政区划代码
-     */
-    @TableField("xzqhCode")
-    private String xzqhCode;
-
-    /**
-     * 行政区划
-     */
-    @TableField("xzqh")
-    private String xzqh;
-
-    /**
-     * 是否参公管理
-     */
-    @TableField("isCGManager")
-    private String isCGManager;
-
-    /**
-     * 是否局（委）办
-     */
-    @TableField("isBureauOffice")
-    private String isBureauOffice;
 
     /**
      * 机构类型代码
@@ -333,47 +248,6 @@ public class SysDept extends TenantEntity {
     @TableField("unitTypeCode")
     private String unitTypeCode;
 
-    /**
-     * 单位性质代码
-     */
-    @TableField("dwxzCode")
-    private String dwxzCode;
-
-    /**
-     * 单位性质
-     */
-    @TableField("dwxz")
-    private String dwxz;
-
-    /**
-     * 系统单位类型编码
-     */
-    @TableField("unitSysTypeCode")
-    private String unitSysTypeCode;
-
-    /**
-     * 系统单位类型
-     */
-    @TableField("unitSysType")
-    private String unitSysType;
-
-    /**
-     * 单位系统类别描述
-     */
-    @TableField("dwxtlbms")
-    private String dwxtlbms;
-
-    /**
-     * 机构规格代码
-     */
-    @TableField("unitLevelCode")
-    private String unitLevelCode;
-
-    /**
-     * 机构规格
-     */
-    @TableField("unitLevel")
-    private String unitLevel;
 
     /**
      * 所属区节点

zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -129,17 +129,6 @@ public class SysUser extends TenantEntity {
     @TableField("login_name")
     private String loginName;
 
-    /**
-     * 金蝶系统原始组织结构id
-     */
-    @TableField("kingdee_org_id")
-    private String kingdeeOrgId;
-
-    /**
-     * 金蝶原始用户id
-     */
-    @TableField("kingdee_user_id")
-    private String kingdeeUserId;
 
     /**
      * 用户类型
@@ -147,11 +136,6 @@ public class SysUser extends TenantEntity {
     @TableField("type")
     private String type;
 
-    /**
-     * 所属租户 新增用户时，租户code为当前登录用户的租户code
-     */
-    @TableField("tenant_code")
-    private String tenantCode;
 
     /**
      * 执法证件号
@@ -207,11 +191,6 @@ public class SysUser extends TenantEntity {
     @TableField("updateAt")
     private String updateAt;
 
-    /**
-     * 下游唯一标识
-     */
-    @TableField("guid")
-    private String guid;
 
     /**
      * 手机号
@@ -273,53 +252,6 @@ public class SysUser extends TenantEntity {
     @TableField("user_source")
     private Integer userSource;
 
-    /**
-     * 英文名
-     */
-    @TableField("engName")
-    private String engName;
-
-    /**
-     * 头像
-     */
-    @TableField("photo")
-    private String photo;
-
-    /**
-     * 备用电话号码
-     */
-    @TableField("spareNumber")
-    private String spareNumber;
-
-    /**
-     * 座机号码
-     */
-    @TableField("telephoneNumber")
-    private String telephoneNumber;
-
-    /**
-     * 办公传真号码
-     */
-    @TableField("faxNumber")
-    private String faxNumber;
-
-    /**
-     * 性别代码
-     */
-    @TableField("genderCode")
-    private String genderCode;
-
-    /**
-     * 排序号
-     */
-    @TableField("sequence")
-    private String sequence;
-
-    /**
-     * 管理单位
-     */
-    @TableField("gldw")
-    private String gldw;
 
     /**
      * 人员类别代码
@@ -333,161 +265,6 @@ public class SysUser extends TenantEntity {
     @TableField("rylb")
     private String rylb;
 
-    /**
-     * 人员状态代码
-     */
-    @TableField("ryztCode")
-    private String ryztCode;
-
-    /**
-     * 人员状态
-     */
-    @TableField("ryzt")
-    private String ryzt;
-
-    /**
-     * 是否单位主要领导
-     */
-    @TableField("dwzyld")
-    private String dwzyld;
-
-    /**
-     * 是否主持工作领导
-     */
-    @TableField("zcgzld")
-    private String zcgzld;
-
-    /**
-     * 职务名称
-     */
-    @TableField("positionname")
-    private String positionname;
-
-    /**
-     * 职务简称代码
-     */
-    @TableField("zwjcCode")
-    private String zwjcCode;
-
-    /**
-     * 职务简称
-     */
-    @TableField("zwjc")
-    private String zwjc;
-
-    /**
-     * 职务标识代码
-     */
-    @TableField("zwbsCode")
-    private String zwbsCode;
-
-    /**
-     * 职务标识
-     */
-    @TableField("zwbs")
-    private String zwbs;
-
-    /**
-     * 级别层级代码
-     */
-    @TableField("jbccCode")
-    private String jbccCode;
-
-    /**
-     * 级别层级
-     */
-    @TableField("jbcc")
-    private String jbcc;
-
-    /**
-     * 所在省
-     */
-    @TableField("province")
-    private String province;
-
-    /**
-     * 所在市
-     */
-    @TableField("city")
-    private String city;
-
-    /**
-     * 所在区/县
-     */
-    @TableField("district")
-    private String district;
-
-    /**
-     * 籍贯代码
-     */
-    @TableField("hometownCode")
-    private String hometownCode;
-
-    /**
-     * 籍贯
-     */
-    @TableField("hometown")
-    private String hometown;
-
-    /**
-     * 聘用类型代码
-     */
-    @TableField("pylxcode")
-    private String pylxcode;
-
-    /**
-     * 聘用类型
-     */
-    @TableField("pylx")
-    private String pylx;
-
-    /**
-     * 合同开始日期
-     */
-    @TableField("contractStartTime")
-    private String contractStartTime;
-
-    /**
-     * 合同结束日期
-     */
-    @TableField("contractEndTime")
-    private String contractEndTime;
-
-    /**
-     * 管理责任人
-     */
-    @TableField("glzrr")
-    private String glzrr;
-
-    /**
-     * 人员来源单位
-     */
-    @TableField("rylydw")
-    private String rylydw;
-
-    /**
-     * 进入本单位方式代码
-     */
-    @TableField("jrfscode")
-    private String jrfscode;
-
-    /**
-     * 进入本单位方式
-     */
-    @TableField("jrfs")
-    private String jrfs;
-
-    /**
-     * 政务微信手机号
-     */
-    @TableField("zwwxMobile")
-    private String zwwxMobile;
-
-    /**
-     * 市政务微信id
-     */
-    @TableField("zwwxId")
-    private String zwwxId;
 
 
     public SysUser(Long userId) {

zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -220,7 +220,6 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId());
         lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), SysDept::getParentId, bo.getParentId());
         lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName());
-        lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysDept::getDeptCategory, bo.getDeptCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus());
         lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
             SysDept::getCreateTime, params.get("beginTime"), params.get("endTime"));