Merge branch 'release/3.0.2.2504.01' into custom/中航富士达

# Conflicts:
#	resource/WEB-INF/prop/hrmSalary.properties

resource/WEB-INF/prop/hrmSalary.properties

@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=3.0.0.250305.01
+version=3.0.2.250430.02
 openFormulaForcedEditing=false

src/com/engine/salary/service/impl/TaxAgentServiceImpl.java

@@ -687,29 +687,15 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
             return taxAgentManageRangeEmployeeList;
         }
 
-        List<Long> taxAgentIds = allTaxAgents.stream().map(TaxAgentPO::getId).collect(Collectors.toList());
-        if (employeeStatus != null) {
-            List<String> personnelStatusList;
-            // 查询人员状态
-//            if (employeeStatus.equals(SalaryEmployeeStatusEnum.NORMAL)) {
-//                allEmployees = allEmployees.stream().filter(f -> UserStatusEnum.getNormalStatus().contains(f.getStatus())).collect(Collectors.toList());
-//            } else if (employeeStatus.equals(SalaryEmployeeStatusEnum.UNAVAILABLE)) {
-//                allEmployees = allEmployees.stream().filter(f -> UserStatusEnum.getUnavailableStatus().contains(f.getStatus())).collect(Collectors.toList());
-//            }
-        }
+        TaxAgentQueryParam param = TaxAgentQueryParam.builder().build();
+        param.setFilterType(AuthFilterTypeEnum.QUERY_DATA);
+        List<TaxAgentPO> taxAgentList = listAuth(param);
+        List<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentList, TaxAgentPO::getId, Collectors.toList());
 
-        // 是否开启分权
-        if (!isOpenDevolution() || isChief(employeeId)) {
-            return getTaxAgentEmp(allTaxAgents, taxAgentIds);
-        }
 
-        // 1.判断自己是否是管理员， 如果是管理员，就是能够操作所属个税扣缴义务人下的所有人的数据
-        List<TaxAgentAdminPO> taxAgentAdminList = getTaxAgentAdminService(user).listByTaxAgentIdsAndEmployeeId(taxAgentIds, (long) user.getUID());
-        // 是管理员的列表
-        List<Long> adminTaxAgentIds = taxAgentAdminList.stream().map(TaxAgentAdminPO::getTaxAgentId).collect(Collectors.toList());
-
-        if (CollectionUtils.isNotEmpty(adminTaxAgentIds)) {
-            taxAgentManageRangeEmployeeList.addAll(getTaxAgentEmp(allTaxAgents, adminTaxAgentIds));
+        if (CollectionUtils.isNotEmpty(taxAgentIds)) {
+            List<TaxAgentManageRangeEmployeeDTO> taxAgentEmp = getTaxAgentEmp(allTaxAgents, taxAgentIds);
+            taxAgentManageRangeEmployeeList.addAll(taxAgentEmp);
         }
 
         return taxAgentManageRangeEmployeeList;

src/com/engine/salary/util/excel/ExcelUtilPlus.java

@@ -131,7 +131,7 @@ public class ExcelUtilPlus {
         for (int i = 0; i < header.size(); i++) {
             WeaTableColumnGroup columnGroupItem = (WeaTableColumnGroup) header.get(i);
             XSSFCell rowZeroCell = row0.createCell(i, CellType.STRING);
-            rowZeroCell.setCellValue(columnGroupItem.getText().toString());
+            rowZeroCell.setCellValue(columnGroupItem.getText());
             rowZeroCell.setCellStyle(titleCellStyle);
             //设置列宽
             sheet.setColumnWidth(i, Math.min(255, Math.max(12, columnGroupItem.getText().length() * 4)) * 256);