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

费用减免调整

This commit is contained in:
syruan 2026-01-15 13:59:14 +08:00
parent 0c2cf7ac71
commit 6c7bf4bf72
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
View File

@ -74,9 +74,10 @@ public class SelectServiceImpl implements SelectService {
// } // }
if (CollectionUtils.isNotEmpty(userRoles)) { if (CollectionUtils.isNotEmpty(userRoles)) {
// 技术员只查询项目部类型的单位,固定传值36（项目部类型） // 技术员只查询项目部类型的单位,固定传值36（项目部类型）
if (userRoles.contains("jsy")) { // 暂时取消项目部限制 2026-01-14 syruan
bmUnit.setTypeId(36L); // if (userRoles.contains("jsy")) {
} // bmUnit.setTypeId(36L);
// }
} }
stepTimes.put("过滤判断", System.currentTimeMillis() - step2Start); stepTimes.put("过滤判断", System.currentTimeMillis() - step2Start);

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
View File

@ -1751,6 +1751,8 @@ public class SltAgreementInfoController extends BaseController {
if (query == null) { if (query == null) {
query = new SltAgreementInfo(); query = new SltAgreementInfo();
} }
Long deptId = typeService.getUserDeptId();
query.setCompanyId(deptId);
startPage(); startPage();
// ----------- 查询未结算的全部协议 --------------- // ----------- 查询未结算的全部协议 ---------------