feature: 导入部门、岗位与用户数据后运行错误修改

ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java

@@ -17,7 +17,7 @@ public class SmsLoginBody extends LoginBody {
     /**
      * 手机号
      */
-    @NotBlank(message = "{user.phonenumber.not.blank}")
+    @NotBlank(message = "{user.phone.not.blank}")
     private String phonenumber;
 
     /**

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -36,7 +36,7 @@ public class LoginHelper {
     public static final String USER_NAME_KEY = "userName";
     public static final String DEPT_KEY = "deptId";
     public static final String DEPT_NAME_KEY = "deptName";
-    public static final String DEPT_CATEGORY_KEY = "deptCategory";
+    public static final String DEPT_CATEGORY_KEY = "deptType";
     public static final String CLIENT_KEY = "clientid";
 
     /**

ruoyi-modules/ruoyi-gen/pom.xml

@@ -65,7 +65,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.kingbase</groupId>
+            <groupId>cn.com.kingbase</groupId>
             <artifactId>kingbase8</artifactId>
         </dependency>
 

ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java

@@ -39,9 +39,9 @@ public class SysSmsController extends BaseController {
      *
      * @param phonenumber 用户手机号
      */
-    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
+    @RateLimiter(key = "#phone", time = 60, count = 1)
     @GetMapping("/code")
-    public R<Void> smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+    public R<Void> smsCaptcha(@NotBlank(message = "{user.phone.not.blank}") String phonenumber) {
         String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
         String code = RandomUtil.randomNumbers(4);
         RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));

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

@@ -14,7 +14,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_config")
+@TableName("t_sys_config")
 public class SysConfig extends TenantEntity {
 
     /**

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

@@ -1,7 +1,6 @@
 package org.dromara.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -44,7 +43,7 @@ public class SysDept extends TenantEntity {
     /**
      * 部门类别编码
      */
-    private String deptCategory;
+    private String deptType;
 
     /**
      * 显示顺序

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

@@ -32,6 +32,7 @@ public class SysUser extends TenantEntity {
      */
     private Long deptId;
 
+
     /**
      * 用户账号
      */
@@ -47,6 +48,10 @@ public class SysUser extends TenantEntity {
      */
     private String userType;
 
+    /**
+     * 用户身份（0=内部用户 1=老师 2=学生 3=家长  4=其他人员）
+     */
+    private String category;
     /**
      * 用户邮箱
      */
@@ -55,7 +60,7 @@ public class SysUser extends TenantEntity {
     /**
      * 手机号码
      */
-    private String phonenumber;
+    private String phone;
 
     /**
      * 用户性别

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

@@ -56,7 +56,7 @@ public class SysDeptVo implements Serializable {
      * 部门类别编码
      */
     @ExcelProperty(value = "部门类别编码")
-    private String deptCategory;
+    private String deptType;
 
     /**
      * 显示顺序

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

@@ -68,7 +68,7 @@ public class SysUserVo implements Serializable {
      * 手机号码
      */
     @Sensitive(strategy = SensitiveStrategy.PHONE)
-    private String phonenumber;
+    private String phone;
 
     /**
      * 用户性别（0男 1女 2未知）

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java

@@ -102,7 +102,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     @Override
     public LoginUser getUserInfoByPhonenumber(String phonenumber, String tenantId) throws UserException {
         return TenantHelper.dynamic(tenantId, () -> {
-            SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber));
+            SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhone, phonenumber));
             if (ObjectUtil.isNull(sysUser)) {
                 throw new UserException("user.not.exists", phonenumber);
             }
@@ -263,7 +263,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
                 dept = deptService.selectDeptById(userVo.getDeptId());
             }
             loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName());
-            loginUser.setDeptCategory(ObjectUtil.isNull(dept) ? "" : dept.getDeptCategory());
+            loginUser.setDeptCategory(ObjectUtil.isNull(dept) ? "" : dept.getDeptType());
             List<SysRoleVo> roles = roleService.selectRolesByUserId(userVo.getUserId());
             loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
         });

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

@@ -81,7 +81,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
         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.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysDept::getDeptType, bo.getDeptCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus());
         lqw.orderByAsc(SysDept::getAncestors);
         lqw.orderByAsc(SysDept::getParentId);

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

@@ -84,7 +84,7 @@ public class SysUserServiceImpl implements ISysUserService {
             .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
             .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
             .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 "u.create_time", params.get("beginTime"), params.get("endTime"))
             .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
@@ -114,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService {
             .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
             .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
             .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
             .orderByAsc("u.user_id");
         Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
         return TableDataInfo.build(page);
@@ -134,7 +134,7 @@ public class SysUserServiceImpl implements ISysUserService {
             .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
             .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
             .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
             .orderByAsc("u.user_id");
         Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
         return TableDataInfo.build(page);
@@ -159,7 +159,7 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public SysUserVo selectUserByPhonenumber(String phonenumber) {
-        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber));
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhone, phonenumber));
     }
 
     /**
@@ -246,7 +246,7 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     public boolean checkPhoneUnique(SysUserBo user) {
         boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
-            .eq(SysUser::getPhonenumber, user.getPhonenumber())
+            .eq(SysUser::getPhone, user.getPhonenumber())
             .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
         return !exist;
     }
@@ -391,7 +391,7 @@ public class SysUserServiceImpl implements ISysUserService {
         return baseMapper.update(null,
             new LambdaUpdateWrapper<SysUser>()
                 .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName())
-                .set(SysUser::getPhonenumber, user.getPhonenumber())
+                .set(SysUser::getPhone, user.getPhonenumber())
                 .set(SysUser::getEmail, user.getEmail())
                 .set(SysUser::getSex, user.getSex())
                 .eq(SysUser::getUserId, user.getUserId()));
@@ -615,8 +615,8 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     public String selectPhonenumberById(Long userId) {
         SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId));
-        return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhonenumber();
+            .select(SysUser::getPhone).eq(SysUser::getUserId, userId));
+        return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhone();
     }
 
     /**

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

@@ -17,7 +17,7 @@
             ${ew.getSqlSelect}
         </if>
         <if test="ew.getSqlSelect == null">
-            u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
+            u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
         </if>
         from t_sys_user u
@@ -30,7 +30,7 @@
             ${ew.getSqlSelect}
         </if>
         <if test="ew.getSqlSelect == null">
-            u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
+            u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
         </if>
         from t_sys_user u
@@ -38,7 +38,7 @@
     </select>
 
     <select id="selectUserExportList" resultMap="SysUserExportResult">
-        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.phone, 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
         from t_sys_user u
@@ -48,7 +48,7 @@
     </select>
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phone, u.status, u.create_time
         from t_sys_user u
              left join t_sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id
@@ -57,7 +57,7 @@
     </select>
 
     <select id="selectUnallocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phone, u.status, u.create_time
         from t_sys_user u
              left join t_sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id