bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题项修改

This commit is contained in:
csyue 2024-05-28 15:50:36 +08:00
parent fba49bc8ed
commit 43e0624cda
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
View File

@ -58,9 +58,9 @@ public class TokenController {
//web端登录 //web端登录
@PostMapping("login") @PostMapping("login")
public R<?> login(@RequestBody LoginBody form) throws Exception { public R<?> login(@RequestBody LoginBody form) throws Exception {
String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); // String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey);
// 用户登录 // 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
String uuid = form.getUuid(); String uuid = form.getUuid();
String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString();
if (StringUtils.isBlank(captcha)) { if (StringUtils.isBlank(captcha)) {

17
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -442,11 +442,8 @@ public class TmTaskServiceImpl implements TmTaskService {
List<TmTask> tmTaskList; List<TmTask> tmTaskList;
if (roles.contains(STRING_ADMIN)) { if (roles.contains(STRING_ADMIN)) {
tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record); tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record);
} else if (deptId == 101) { } else if (deptId != null) {
record.setCompanyId(101); record.setCompanyId(deptId.intValue());
tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record);
} else if (deptId == 102) {
record.setCompanyId(102);
tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record); tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record);
} else { } else {
String username = SecurityUtils.getLoginUser().getUsername(); String username = SecurityUtils.getLoginUser().getUsername();
@ -619,12 +616,18 @@ public class TmTaskServiceImpl implements TmTaskService {
Set<String> roles = SecurityUtils.getLoginUser().getRoles(); Set<String> roles = SecurityUtils.getLoginUser().getRoles();
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
List<TmTask> tmTaskList = new ArrayList<>(); List<TmTask> tmTaskList = new ArrayList<>();
if (roles.contains("fgs") && roles.contains("sgb")) { if (roles.contains("admin")) {
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} else if (roles.contains("fgs") && roles.contains("sgb")) {
record.setCompanyId(101); record.setCompanyId(101);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} else if (roles.contains("fgs")) { } else if (roles.contains("fgs") && (roles.contains("em01") || roles.contains("em02"))) { //机具书记/副经理内部审批权限
record.setCompanyId(101);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} else if (roles.contains("fgs")){
record.setDeptId(deptId); record.setDeptId(deptId);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} }
Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
for (TmTask tmTask : tmTaskList) { for (TmTask tmTask : tmTaskList) {