renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 3月3日后develop分支代码迁移至xc分支

Browse Source
This commit is contained in:
hejiayang
2026-03-24 12:02:26 +08:00
parent 0389fc8390
commit a3bf6a2063
15 changed files with 543 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SysApiController.java
+13
View File
@@ -3,16 +3,20 @@ package org.jeecg.modules.api.controller;
import org.jeecg.base.UserBase;
import org.jeecg.bean.response.BaseEmployeeInfo;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.system.bean.response.ScalePersonalUserInfo;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.service.ScalePersonalService;
import org.jeecg.util.AesEncryptUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author stan
@@ -67,5 +71,14 @@ public class SysApiController {
return Result.ok(sysUserService.getUserInfo());
}
/**
* 字符串加密
*/
@GetMapping("encryptInfo")
public Result<Map<String, String>> encryptInfo(@RequestParam String str) throws Exception {
Map<String, String> map = new HashMap<>();
map.put("encryptData", AesEncryptUtils.encrypt(str, CommonConstant.URL_SECRET_KEY));
return Result.ok(map);
}
}
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+16
View File
@@ -3906,6 +3906,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if (null == loginUser) {
ExceptionAssertsUtil.fail("用户不存在！");
}
List<String> managedCodes = GlobalUtils.getManagedCodes(null);
Set<String> departIds = new HashSet<>();
if (CollUtil.isNotEmpty(managedCodes)) {
managedCodes.forEach(s -> {
String departIdByOrgCode = sysCache.getDepartIdByOrgCode(s);
if (StringUtils.isNotBlank(departIdByOrgCode) && !"null".equals(departIdByOrgCode)) {
departIds.add(departIdByOrgCode);
}
});
}
MPJLambdaWrapper<SysUser> queryWrapper = new MPJLambdaWrapper<SysUser>()
.selectAs(SysUser::getId, BaseEmployeeInfo::getUserId)
.selectAs(SysUser::getUsername, BaseEmployeeInfo::getUserName)
@@ -3931,13 +3941,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
baseEmployeeInfo.setAge(ObjectUtils.isNotEmpty(loginUser.getAge()) && loginUser.getAge() > 0 ? loginUser.getAge() : null);
SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(loginUser.getOrgCode()));
baseEmployeeInfo.setSecondDeptCode(secondDepart.getOrgCode());
baseEmployeeInfo.setSecondDeptId(secondDepart.getId());
baseEmployeeInfo.setSecondDeptName(secondDepart.getDepartName());
SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(loginUser.getOrgCode()));
baseEmployeeInfo.setThirdDeptCode(thirdDepart.getOrgCode());
baseEmployeeInfo.setThirdDeptId(thirdDepart.getId());
baseEmployeeInfo.setThirdDeptName(thirdDepart.getDepartName());
baseEmployeeInfo.setThisDeptCode(loginUser.getOrgCode());
SysDepart departByOrgCode = sysCache.getDepartByOrgCode(loginUser.getOrgCode());
baseEmployeeInfo.setThisDeptName(departByOrgCode.getDepartName());
baseEmployeeInfo.setThisDeptId(departByOrgCode.getId());
baseEmployeeInfo.setRoleCodes(loginUser.getRoleCodes());
baseEmployeeInfo.setDepartCodes(String.join(",", managedCodes));
baseEmployeeInfo.setDepartIds(String.join(",", departIds));
return baseEmployeeInfo;
}
}