From 8e7abc18544c23295ee3f805901fd7cc1770d794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 19 Dec 2025 16:09:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?token=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/util/SalaryTokenUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/util/SalaryTokenUtil.java b/src/com/engine/salary/util/SalaryTokenUtil.java index 651ec4e64..ec19d9ace 100644 --- a/src/com/engine/salary/util/SalaryTokenUtil.java +++ b/src/com/engine/salary/util/SalaryTokenUtil.java @@ -101,15 +101,18 @@ public class SalaryTokenUtil { // 获取appid的id String appidId = baseBean.getPropValue("hrmSalaryBillToken", "appid_id"); if (StringUtils.isBlank(appidId)) { + resultMap.put("msg", "appid_id为空"); return resultMap; } String ip = baseBean.getPropValue("hrmSalaryBillToken", "ip"); - rs.execute("select APPID from ECOLOGY_BIZ_EC where id =" + appidId); + String appidSql = String.format("select APPID from ECOLOGY_BIZ_EC where id ='%s'", appidId); + rs.execute(appidSql); // 获取appid String appid =""; if (rs.next() && StringUtils.isNotEmpty(rs.getString("APPID"))) { appid = rs.getString("APPID"); } else { + resultMap.put("msg", "APPID为空,sql:"+appidSql); return resultMap; } String sql= " SELECT conf_value FROM hrsa_salary_sys_conf t WHERE delete_type = 0 AND conf_key = 'SALARY_TOKEN_SECRET'"; From eb35dddfbd1038dfd34a1520d7ee2ed78a1d68fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 7 Jan 2026 15:07:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index 6bf5b3da9..7d4859ad4 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -377,7 +377,7 @@ WHERE 1=1 AND base.delete_type = 0 - AND base.employee_type is null + AND (base.employee_type is null or base.employee_type = 0) ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc} From ae731d0bce28e1809ba0ac3c12beceb6cecfd2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 12 Jan 2026 10:58:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/TaxDeclareRecordServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java index 2c78fa48e..360d4e2bb 100644 --- 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 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));