Merge branch 'release/个税&业务线' into custom/联特

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)
         <include refid="condition"></include>
         <if test="param.orderRule != null">
             ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}

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

@@ -957,8 +957,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) {
@@ -991,6 +990,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));

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'";