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

Merge branch 'bonus_anjiju' of http://192.168.30.2:3000/bonus/Bonus-Cloud into bonus_anjiju

This commit is contained in:
hongchao 2026-01-09 10:04:53 +08:00
parent eb5850e99f 4fdcf49261
commit 02a512a8a4
6 changed files with 37 additions and 15 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;
/** 字典主键 */
@Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
@Excel(name = "字典编号", cellType = ColumnType.NUMERIC)
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;
/** 角色ID */
@Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
@Excel(name = "角色编号", cellType = ColumnType.NUMERIC)
private Long roleId;
/** 角色名称 */
@ -32,11 +32,11 @@ public class SysRole extends BaseEntity
private String roleName;
/** 角色权限 */
@Excel(name = "角色权限")
@Excel(name = "权限字符")
private String roleKey;
/** 角色排序 */
@Excel(name = "角色排序")
@Excel(name = "角色排序", cellType = ColumnType.NUMERIC)
private Integer roleSort;
/** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
@ -50,7 +50,7 @@ public class SysRole extends BaseEntity
private boolean deptCheckStrictly;
/** 角色状态（0正常 1停用） */
@Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status;
/** 删除标志（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
*/
@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
//@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
private Long userId;
/**
@ -48,13 +48,13 @@ public class SysUser extends BaseEntity {
/**
* 用户账号
*/
@Excel(name = "登录名称")
@Excel(name = "登录名")
private String userName;
/**
* 用户昵称
*/
@Excel(name = "用户名称")
@Excel(name = "用户昵称")
private String nickName;
/**
@ -99,7 +99,7 @@ public class SysUser extends BaseEntity {
/**
* 最后登录IP
*/
@Excel(name = "最后登录IP", type = Type.EXPORT)
//@Excel(name = "最后登录IP", type = Type.EXPORT)
private String loginIp;
/**
@ -112,8 +112,8 @@ public class SysUser extends BaseEntity {
* 部门对象
*/
@Excels({
@Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
@Excel(name = "部门", targetAttr = "deptName", type = Type.EXPORT),
//@Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
})
private SysDept dept;

2
bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java
View File

@ -204,7 +204,7 @@ public class TokenService {
private Long getTokenTime(){
long tokenTime = 20L;
String redisResult = redisService.getCacheObject("sys_config:"+ "sys.visit.tokentime");
if(!redisResult.isEmpty()) {
if(redisResult != null && !redisResult.isEmpty()) {
tokenTime = Long.parseLong(redisResult);
}else {
Long result = systemConfig.getTokenTime();

3
bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
View File

@ -527,7 +527,8 @@ public class SysUserController extends BaseController {
/**
* 查询部门人员树列表
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list"))
// @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list"))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@PostMapping("/deptUserTree")
public AjaxResult deptUserTree(@RequestBody SysUser sysUser) {
try {

25
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());
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;
}
@ -158,7 +165,14 @@ public class SysUserServiceImpl implements ISysUserService {
*/
@Override
public SysUser selectUserByUserName(String userName) {
return userMapper.selectUserByUserName(userName);
SysUser sysUser = userMapper.selectUserByUserName(userName);
if (sysUser != null && StringUtils.isNotBlank(sysUser.getPhonenumber())) {
//如果手机号长度超过11位，则需要进行解密
if (sysUser.getPhonenumber().length() > 11) {
sysUser.setPhonenumber(Sm4Utils.decrypt(sysUser.getPhonenumber()));
}
}
return sysUser;
}
/**
@ -191,7 +205,14 @@ public class SysUserServiceImpl implements ISysUserService {
*/
@Override
public SysUser selectUserById(Long userId) {
return userMapper.selectUserById(userId);
SysUser sysUser = userMapper.selectUserById(userId);
if (sysUser != null && StringUtils.isNotBlank(sysUser.getPhonenumber())) {
//如果手机号长度超过11位，则需要进行解密
if (sysUser.getPhonenumber().length() > 11) {
sysUser.setPhonenumber(Sm4Utils.decrypt(sysUser.getPhonenumber()));
}
}
return sysUser;
}
/**