修改登陆报错,用户变更,导入添加工号

liweidong
ShiJiuZhou 2 days ago
parent d46e120ef1
commit 59e07299ce
  1. 63
      blade-auth/src/main/java/org/springblade/core/oauth2/exception/ExceptionCode.java
  2. 4
      blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java
  3. 3
      blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java
  4. 3
      blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml

@ -0,0 +1,63 @@
package org.springblade.core.oauth2.exception;
import lombok.Generated;
/**
* @author 石玖洲
* @Description
* @create 2026-04-18 10:22
*/
public enum ExceptionCode implements Oauth2ExceptionCode {
INVALID_REQUEST(2000, "无效请求"),
USER_NOT_FOUND(2001, "用户不存在"),
USER_TENANT_NOT_FOUND(2002, "用户租户不存在"),
USER_TOO_MANY_FAILS(2003, "用户登录失败次数过多"),
INVALID_USER(2004, "认证信息错误或无效"),
INVALID_USER_PASSWORD(2004, "用户密码强度过低"),
UNAUTHORIZED_USER(2005, "用户密码错误"),
UNAUTHORIZED_USER_TENANT(2006, "用户租户未授权"),
INVALID_REFRESH_TOKEN(2010, "令牌刷新错误或无效"),
CLIENT_NOT_FOUND(3000, "客户端不存在"),
INVALID_CLIENT(3001, "客户端认证失败"),
INVALID_CLIENT_REDIRECT_URI(3002, "客户端未授权"),
UNAUTHORIZED_CLIENT(3003, "客户端未授权"),
UNSUPPORTED_GRANT_TYPE(4000, "不支持的授权类型"),
INVALID_GRANTER(4001, "无效的授权类型"),
INVALID_SCOPE(4002, "授权范围"),
SERVER_ERROR(5000, "服务器错误"),
ACCESS_DENIED(5001, "访问被拒绝"),
TEMPORARILY_UNAVAILABLE(5002, "服务暂不可用");
final int code;
final String message;
public static org.springblade.core.oauth2.exception.ExceptionCode of(int code) {
org.springblade.core.oauth2.exception.ExceptionCode[] var1 = values();
int var2 = var1.length;
for(int var3 = 0; var3 < var2; ++var3) {
org.springblade.core.oauth2.exception.ExceptionCode value = var1[var3];
if (value.code == code) {
return value;
}
}
throw new IllegalArgumentException(String.format("无效的错误代码: %s", code));
}
@Generated
public int getCode() {
return this.code;
}
@Generated
public String getMessage() {
return this.message;
}
@Generated
private ExceptionCode(final int code, final String message) {
this.code = code;
this.message = message;
}
}

@ -114,9 +114,5 @@ public class User extends TenantEntity {
* 是否主管
*/
private Integer isLeader;
/**
* 工号
*/
private String workNo;
}

@ -53,6 +53,9 @@ public class UserExcel implements Serializable {
@ExcelProperty("租户编号")
private String tenantId;
@ExcelProperty("工号")
private String code;
@ExcelIgnore
@ExcelProperty("用户平台")
private String userType;

@ -90,6 +90,9 @@
<if test="user.status!=null and user.status>=0">
and status = #{user.status}
</if>
<if test="user.code != null and user.code != ''">
and code = #{user.code}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
and id in (
SELECT

Loading…
Cancel
Save