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

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

@@ -929,8 +929,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
                             employeeInfoMap.remove(employeeName + "-" + cardNum);
                         }
                     }
-                }
+                } else if (map.containsKey("employeeList")) {
-                if (map.containsKey("employeeList")) {
                     List<Map> emps = JsonUtil.parseList(map.get("employeeList"), Map.class);
                     if (emps != null) {
                         for (Map detail : emps) {
@@ -963,6 +962,9 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
                             employeeInfoMap.remove(employeeName + "-" + cardNum);
                         }
                     }
+                }else if (map.containsKey("msg")) {
+                    String msg = Util.null2String(map.get("msg"));
+                    errorMsg.add(msg);
                 }
             }
             declareStatus.setTaxDeclareErrorMsg(String.join(",", errorMsg));