Commit 7c099d37 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 45cede82
...@@ -805,9 +805,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu ...@@ -805,9 +805,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
//处理员工合同签订规则日志 //处理员工合同签订规则日志
if (Common.isNotNull(autoContractRuleNew)){ if (Common.isNotNull(autoContractRuleNew)){
if (Common.isEmpty(autoContractRuleOld)){ if (Common.isEmpty(autoContractRuleOld)){
autoInsurRuleOld = new TAutoInsurRuleInfo(); autoContractRuleOld = new TAutoContractRuleInfo();
} }
String differenceKey = HrEquator.comparisonValueIgnoreField(autoInsurRuleOld, autoContractRuleNew,ignoreFields); String differenceKey = HrEquator.comparisonValueIgnoreField(autoContractRuleOld, autoContractRuleNew,ignoreFields);
if (!Common.isEmpty(differenceKey)){ if (!Common.isEmpty(differenceKey)){
diffKeyMap.put("contractRule",differenceKey); diffKeyMap.put("contractRule",differenceKey);
oldMap.put("oldcontractRule",autoContractRuleOld); oldMap.put("oldcontractRule",autoContractRuleOld);
......
...@@ -150,12 +150,12 @@ public class HrEquator extends GetterBaseEquator { ...@@ -150,12 +150,12 @@ public class HrEquator extends GetterBaseEquator {
continue; continue;
} }
curMap.put(fieldName, 1); curMap.put(fieldName, 1);
if (!"updateTime".equals(fieldName) && !"updateBy".equals(fieldName) && !"java.util.List".equals(field.getFirstFieldType().getName())) { if (!"updateTime".equals(fieldName) && !"updateBy".equals(fieldName) && (null != field.getFirstFieldType() && !"java.util.List".equals(field.getFirstFieldType().getName()))) {
newChange = true; newChange = true;
sb.append(field.getFieldName()).append(","); sb.append(field.getFieldName()).append(",");
} }
try { try {
if ("java.util.List".equals(field.getFirstFieldType().getName())) { if (null != field.getFirstFieldType() && "java.util.List".equals(field.getFirstFieldType().getName())) {
List<Object> firstList = (List<Object>) field.getFirstVal(); List<Object> firstList = (List<Object>) field.getFirstVal();
List<Object> secondList = (List<Object>) field.getSecondVal(); List<Object> secondList = (List<Object>) field.getSecondVal();
curMap.put(fieldName, 1); curMap.put(fieldName, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment