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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
itcast 2026-01-09 18:06:25 +08:00
parent 38b7f3bea7 70d1ca586d
commit 2da9fa931b
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java
View File

@ -371,6 +371,8 @@ public class LeaseTaskController extends BaseController {
Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
try {
Long deptId = typeService.getUserDeptId();
leaseApplyInfo.setCompanyId(deptId);
List<LeaseApplyInfo> list = service.selectAuditLeaseApplyInfoList(leaseApplyInfo);
if (leaseApplyInfo.getIsApp()==null){
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));

50
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
View File

@ -674,33 +674,33 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
@Override
public List<LeaseApplyInfo> selectAuditLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo) {
Long userId = SecurityUtils.getLoginUser().getUserid();
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
leaseApplyInfo.setUserId(userId == 1 ? null : userId);
if(userId == 1 || deptId == 101){
leaseApplyInfo.setDeptId(null);
}else{
//判断祖籍有没有101
String ancestors = mapper.getAncestors(deptId);
boolean contains101 = false;
if (ancestors != null && !ancestors.isEmpty()) {
String[] parts = ancestors.split(",");
for (String part : parts) {
if ("101".equals(part.trim())) {
contains101 = true;
break;
}
}
}
if(contains101){
leaseApplyInfo.setDeptId(null);
}else{
leaseApplyInfo.setDeptId(deptId);
}
}
// Long userId = SecurityUtils.getLoginUser().getUserid();
// Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
// leaseApplyInfo.setUserId(userId == 1 ? null : userId);
// if(userId == 1 || deptId == 101){
// leaseApplyInfo.setDeptId(null);
// }else{
// //判断祖籍有没有101
// String ancestors = mapper.getAncestors(deptId);
// boolean contains101 = false;
// if (ancestors != null && !ancestors.isEmpty()) {
// String[] parts = ancestors.split(",");
// for (String part : parts) {
// if ("101".equals(part.trim())) {
// contains101 = true;
// break;
// }
// }
// }
// if(contains101){
// leaseApplyInfo.setDeptId(null);
// }else{
// leaseApplyInfo.setDeptId(deptId);
// }
// }
// leaseApplyInfo.setDeptId((userId == 1 || deptId == 101) ? null : deptId);
log.info("用户id为{}",userId);
// log.info("用户id为{}",userId);
List<LeaseApplyInfo> list = mapper.selectAuditLeaseApplyInfoList(leaseApplyInfo);
try {
if (!CollectionUtils.isEmpty(list)) {