Merge branch 'release/3.0.2.2504.01' into release/个税&业务线

resource/WEB-INF/prop/hrmSalary.properties

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

src/com/engine/salary/action/CheckEditSIArchiveAction.java

@@ -80,6 +80,8 @@ public class CheckEditSIArchiveAction implements Action {
             }
             List<Map<String, Object>> importData = new ArrayList<>();
             importData.add(SalaryEntityUtil.convert2Map(list, CheckEditSIArchiveAction.SalaryField::getSalaryName, CheckEditSIArchiveAction.SalaryField::getValue));
+            log.info("CheckEditSIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importData);
+
             //福利执行状态
             String runStatus = list.stream().filter(f -> f.salaryName.equals("档案状态")).findFirst().map(CheckEditSIArchiveAction.SalaryField::getValue).orElse("1");
 

src/com/engine/salary/action/CheckEditSalaryAction.java

@@ -78,6 +78,7 @@ public class CheckEditSalaryAction implements Action {
             List<Map<String, Object>> importData = new ArrayList<>();
             importData.add(SalaryEntityUtil.convert2Map(list, SalaryField::getSalaryName, SalaryField::getValue));
 
+            log.info("CheckEditSalaryAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importData);
             SalaryArchiveImportActionParam build = SalaryArchiveImportActionParam.builder()
                     .importDatas(importData)
                     .build();

src/com/engine/salary/action/CheckInitSalaryAction.java

@@ -98,7 +98,7 @@ public class CheckInitSalaryAction implements Action {
                 list.add(new SalaryField(processField, salaryName, value));
             }
             Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, SalaryField::getSalaryName, SalaryField::getValue);
-
+            log.info("CheckInitSalaryAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
             return doSalaryArchiveInit(requestInfo, importDataMap);
         } catch (Exception e) {
             log.error("定薪检查异常", e);

src/com/engine/salary/action/CheckStayAddToPaySIArchiveAction.java

@@ -89,6 +89,7 @@ public class CheckStayAddToPaySIArchiveAction implements Action {
             }
             // 流程数据
             Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, CheckStayAddToPaySIArchiveAction.SalaryField::getSalaryName, CheckStayAddToPaySIArchiveAction.SalaryField::getValue);
+            log.info("CheckStayAddToPaySIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
             String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString();
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){

src/com/engine/salary/action/CheckStayDelToStopSIArchiveAction.java

@@ -88,6 +88,7 @@ public class CheckStayDelToStopSIArchiveAction implements Action {
             }
             // 流程数据
             Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, CheckStayDelToStopSIArchiveAction.SalaryField::getSalaryName, CheckStayDelToStopSIArchiveAction.SalaryField::getValue);
+            log.info("CheckStayDelToStopSIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
             String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString();
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){

src/com/engine/salary/action/CheckStopSalaryAction.java

@@ -92,6 +92,7 @@ public class CheckStopSalaryAction implements Action {
             }
             // 流程数据
             Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, CheckStopSalaryAction.SalaryField::getSalaryName, CheckStopSalaryAction.SalaryField::getValue);
+            log.info("CheckStopSalaryAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
             String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString();
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){

src/com/engine/salary/action/CopyToPaySIArchiveAction.java

@@ -88,6 +88,7 @@ public class CopyToPaySIArchiveAction implements Action {
         }
         List<Map<String, Object>> importData = new ArrayList<>();
         importData.add(SalaryEntityUtil.convert2Map(list, CopyToPaySIArchiveAction.SalaryField::getSalaryName, CopyToPaySIArchiveAction.SalaryField::getValue));
+        log.info("CopyToPaySIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importData);
         //操作人
         String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(CopyToPaySIArchiveAction.SalaryField::getValue).orElse("1");
         //增员

src/com/engine/salary/action/EditSIArchiveAction.java

@@ -79,6 +79,7 @@ public class EditSIArchiveAction implements Action {
             }
             List<Map<String, Object>> importData = new ArrayList<>();
             importData.add(SalaryEntityUtil.convert2Map(list, EditSIArchiveAction.SalaryField::getSalaryName, EditSIArchiveAction.SalaryField::getValue));
+            log.info("EditSIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importData);
             //福利执行状态
             String runStatus = list.stream().filter(f -> f.salaryName.equals("档案状态")).findFirst().map(EditSIArchiveAction.SalaryField::getValue).orElse("1");
 

src/com/engine/salary/action/EditSalaryAction.java

@@ -77,7 +77,7 @@ public class EditSalaryAction implements Action {
             }
             List<Map<String, Object>> importData = new ArrayList<>();
             importData.add(SalaryEntityUtil.convert2Map(list, SalaryField::getSalaryName, SalaryField::getValue));
-
+            log.info("EditSalaryAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importData);
             SalaryArchiveImportActionParam build = SalaryArchiveImportActionParam.builder()
                     .importDatas(importData)
                     .build();

src/com/engine/salary/action/EditToPaySIArchiveAction.java

@@ -97,6 +97,7 @@ public class EditToPaySIArchiveAction implements Action {
             }
             List<Map<String, Object>> importData = new ArrayList<>();
             importData.add(SalaryEntityUtil.convert2Map(list, EditToPaySIArchiveAction.SalaryField::getSalaryName, EditToPaySIArchiveAction.SalaryField::getValue));
+            log.info("EditToPaySIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importData);
             //福利执行状态
             String runStatus = EmployeeStatusEnum.STAY_ADD.getValue();
 

src/com/engine/salary/action/EditToStopSIArchiveAction.java

@@ -97,6 +97,7 @@ public class EditToStopSIArchiveAction implements Action {
             }
             List<Map<String, Object>> importData = new ArrayList<>();
             importData.add(SalaryEntityUtil.convert2Map(list, EditToStopSIArchiveAction.SalaryField::getSalaryName, EditToStopSIArchiveAction.SalaryField::getValue));
+            log.info("EditToStopSIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importData);
             //福利执行状态
             String runStatus = EmployeeStatusEnum.PAYING.getValue();
 

src/com/engine/salary/action/InitSalaryAction.java

@@ -100,7 +100,7 @@ public class InitSalaryAction implements Action {
             }
 
             Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, SalaryField::getSalaryName, SalaryField::getValue);
-
+            log.info("InitSalaryAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
             return doSalaryArchiveInit(requestInfo, importDataMap);
         } catch (Exception e) {
             log.error("定薪异常", e);

src/com/engine/salary/action/RehireAction.java

@@ -108,6 +108,7 @@ public class RehireAction implements Action {
                 list.add(new SalaryField(processField, salaryName, value));
             }
             Map<String, Object> salaryFieldMap = SalaryEntityUtil.convert2Map(list, SalaryField::getSalaryName, SalaryField::getValue);
+            log.info("RehireAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), salaryFieldMap);
             String taxAgentName = salaryFieldMap.getOrDefault("个税扣缴义务人", "").toString();
             String empIdStr = salaryFieldMap.getOrDefault("员工id", "").toString();
             if (StringUtils.isBlank(taxAgentName) || StringUtils.isBlank(empIdStr)) {

src/com/engine/salary/action/StayAddToPaySIArchiveAction.java

@@ -93,6 +93,7 @@ public class StayAddToPaySIArchiveAction implements Action {
             }
             // 流程数据
             Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, StayAddToPaySIArchiveAction.SalaryField::getSalaryName, StayAddToPaySIArchiveAction.SalaryField::getValue);
+            log.info("StayAddToPaySIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
             String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString();
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){

src/com/engine/salary/action/StayDelToStopSIArchiveAction.java

@@ -94,6 +94,7 @@ public class StayDelToStopSIArchiveAction implements Action {
             }
             // 流程数据
             Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, StayDelToStopSIArchiveAction.SalaryField::getSalaryName, StayDelToStopSIArchiveAction.SalaryField::getValue);
+            log.info("StayDelToStopSIArchiveAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
             String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString();
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){

src/com/engine/salary/action/StopSalaryAction.java

@@ -99,6 +99,7 @@ public class StopSalaryAction implements Action {
             }
             // 流程数据
             Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, StopSalaryAction.SalaryField::getSalaryName, StopSalaryAction.SalaryField::getValue);
+            log.info("StopSalaryAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
             //操作人
             String uid = importDataMap.getOrDefault("操作人","1").toString();
             User user = new User(Integer.parseInt(uid));

src/com/engine/salary/action/UpdateSISchemeDetailAction.java

@@ -117,6 +117,7 @@ public class UpdateSISchemeDetailAction implements Action {
                 rs.beforFirst();
                 // 流程数据
                 Map<String, Object> importDataMap = SalaryEntityUtil.convert2Map(list, UpdateSISchemeDetailAction.SalaryField::getSalaryName, UpdateSISchemeDetailAction.SalaryField::getValue);
+                log.info("UpdateSISchemeDetailAction，tableName ：{}，workflowid：{}，流程参数：{}",tableName, requestInfo.getWorkflowid(), importDataMap);
                 //设置更新对象元素
                 String schemeId = importDataMap.getOrDefault("福利方案id", "").toString();
                 String schemeName = importDataMap.getOrDefault("福利方案名称", "").toString();

src/com/engine/salary/service/auth/AuthDataServiceImpl.java

@@ -21,6 +21,7 @@ import com.engine.salary.mapper.auth.AuthRoleMapper;
 import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Date;
 import java.util.HashSet;
@@ -156,7 +157,7 @@ public class AuthDataServiceImpl extends Service implements AuthDataService {
     public List<AuthRoleDataDTO> listRoleData( AuthDataQueryParam param) {
         List<AuthRoleDataDTO> authRoleDataDTOS = getAuthRoleDataMapper().listRoleData(param.getRoleId());
         if (StrUtil.isNotEmpty(param.getUsername())){
-            authRoleDataDTOS = authRoleDataDTOS.stream().filter(authRoleDataDTO -> authRoleDataDTO.getUsername().contains(param.getUsername())).collect(Collectors.toList());
+            authRoleDataDTOS = authRoleDataDTOS.stream().filter(authRoleDataDTO -> StringUtils.isNotBlank(authRoleDataDTO.getUsername()) && authRoleDataDTO.getUsername().contains(param.getUsername())).collect(Collectors.toList());
         }
         return authRoleDataDTOS;
     }

src/com/engine/salary/service/auth/AuthMemberServiceImpl.java

@@ -24,6 +24,7 @@ import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -196,7 +197,7 @@ public class AuthMemberServiceImpl extends Service implements AuthMemberService
     public List<AuthRoleEmpDTO> listRoleEmp(AuthMemberQueryParam param) {
         List<AuthRoleEmpDTO> empDTOS = getAuthRoleEmpMapper().getByRoleId(param.getRoleId());
         if(StrUtil.isNotEmpty(param.getUsername())){
-            empDTOS =  empDTOS.stream().filter(item -> item.getUsername().contains(param.getUsername())).collect(Collectors.toList());
+            empDTOS =  empDTOS.stream().filter(item -> StringUtils.isNotBlank(item.getUsername()) && item.getUsername().contains(param.getUsername())).collect(Collectors.toList());
         }
 
         return empDTOS;