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

申报失败原因
Merge branch 'release/2.19.1.2501.01' into release/个税版本
2026-01-12 10:59:04 +08:00 · 2026-01-12 10:58:39 +08:00 · 2026-01-07 15:44:23 +08:00
1 changed files with 4 additions and 2 deletions
--- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
@ -929,8 +929,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
                            employeeInfoMap.remove(employeeName + "-" + cardNum);
                        }
                    }
-                }
-                if (map.containsKey("employeeList")) {
+                } else 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));
Author	SHA1	Message	Date
钱涛	c0389245d4	Merge branch 'release/个税版本' into release/个税&业务线	2026-01-12 10:59:04 +08:00
钱涛	ae731d0bce	申报失败原因	2026-01-12 10:58:39 +08:00
钱涛	93708f5327	Merge branch 'release/2.19.1.2501.01' into release/个税版本	2026-01-07 15:44:23 +08:00