bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

优化

This commit is contained in:
mashuai 2025-12-02 10:34:08 +08:00
parent 25c610d12a
commit 4fdcf49261
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictType.java
View File

@ -23,7 +23,7 @@ public class SysDictType extends BaseEntity
int sequence; int sequence;
/** 字典主键 */ /** 字典主键 */
@Excel(name = "字典主键", cellType = ColumnType.NUMERIC) @Excel(name = "字典编号", cellType = ColumnType.NUMERIC)
private Long dictId; private Long dictId;
/** 字典名称 */ /** 字典名称 */

8
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
View File

@ -24,7 +24,7 @@ public class SysRole extends BaseEntity
int sequence; int sequence;
/** 角色ID */ /** 角色ID */
@Excel(name = "角色序号", cellType = ColumnType.NUMERIC) @Excel(name = "角色编号", cellType = ColumnType.NUMERIC)
private Long roleId; private Long roleId;
/** 角色名称 */ /** 角色名称 */
@ -32,11 +32,11 @@ public class SysRole extends BaseEntity
private String roleName; private String roleName;
/** 角色权限 */ /** 角色权限 */
@Excel(name = "角色权限") @Excel(name = "权限字符")
private String roleKey; private String roleKey;
/** 角色排序 */ /** 角色排序 */
@Excel(name = "角色排序") @Excel(name = "角色排序", cellType = ColumnType.NUMERIC)
private Integer roleSort; private Integer roleSort;
/** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */ /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
@ -50,7 +50,7 @@ public class SysRole extends BaseEntity
private boolean deptCheckStrictly; private boolean deptCheckStrictly;
/** 角色状态（0正常 1停用） */ /** 角色状态（0正常 1停用） */
@Excel(name = "角色状态", readConverterExp = "0=正常,1=停用") @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
/** 删除标志（0代表存在 2代表删除） */ /** 删除标志（0代表存在 2代表删除） */

12
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
View File

@ -30,7 +30,7 @@ public class SysUser extends BaseEntity {
/** /**
* 用户ID * 用户ID
*/ */
@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号") //@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
private Long userId; private Long userId;
/** /**
@ -48,13 +48,13 @@ public class SysUser extends BaseEntity {
/** /**
* 用户账号 * 用户账号
*/ */
@Excel(name = "登录名称") @Excel(name = "登录名")
private String userName; private String userName;
/** /**
* 用户昵称 * 用户昵称
*/ */
@Excel(name = "用户名称") @Excel(name = "用户昵称")
private String nickName; private String nickName;
/** /**
@ -99,7 +99,7 @@ public class SysUser extends BaseEntity {
/** /**
* 最后登录IP * 最后登录IP
*/ */
@Excel(name = "最后登录IP", type = Type.EXPORT) //@Excel(name = "最后登录IP", type = Type.EXPORT)
private String loginIp; private String loginIp;
/** /**
@ -112,8 +112,8 @@ public class SysUser extends BaseEntity {
* 部门对象 * 部门对象
*/ */
@Excels({ @Excels({
@Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), @Excel(name = "部门", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) //@Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
}) })
private SysDept dept; private SysDept dept;

7
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
View File

@ -111,6 +111,13 @@ public class SysUserServiceImpl implements ISysUserService {
} }
user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
List<SysUser> sysUsers = userMapper.selectUserList(user); List<SysUser> sysUsers = userMapper.selectUserList(user);
if (!CollectionUtils.isEmpty(sysUsers)) {
sysUsers.forEach(item -> {
if (item.getPhonenumber() != null && item.getPhonenumber().length() > 11) {
item.setPhonenumber(Sm4Utils.decrypt(item.getPhonenumber()));
}
});
}
return sysUsers; return sysUsers;
} }