qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

This commit is contained in:
Harryxzy 2025-06-19 17:28:50 +08:00
parent 45acec8468 bfd953d082
commit 2cd9484069
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
View File

@ -850,7 +850,7 @@ public class SalaryBillBO {
if ("text".equals(wmClassify)) { if ("text".equals(wmClassify)) {
wmTextFieldIds = (List<String>) salaryBillWatermark.getWmSetting().getOrDefault("wmSelectedFieldIds", Collections.emptyList()); wmTextFieldIds = (List<String>) salaryBillWatermark.getWmSetting().getOrDefault("wmSelectedFieldIds", Collections.emptyList());
List<String> empFields = Arrays.asList(HRM_Name, HRM_Num, HRM_Mobile, HRM_Email, HRM_CurrentOperatorId, HRM_Department); List<String> empFields = Arrays.asList(HRM_Name, HRM_Num, HRM_Mobile, HRM_Email, HRM_CurrentOperatorId, HRM_Department, HRM_SecondDepartment);
if (wmTextFieldIds.contains(HRM_SecondDepartment)) { if (wmTextFieldIds.contains(HRM_SecondDepartment)) {
// 需要查分部 // 需要查分部
salaryBillWatermark.getWmSetting().put("needQuerySubDepart", true); salaryBillWatermark.getWmSetting().put("needQuerySubDepart", true);