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

This commit is contained in:
钱涛 2025-12-24 17:47:22 +08:00
commit e05288c4c0
1 changed files with 4 additions and 1 deletions

View File

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