Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer
This commit is contained in:
commit
616e0e4c7a
|
|
@ -186,7 +186,9 @@ public class ElderApi {
|
|||
}
|
||||
String orgCode = nuId.substring(4, 7);
|
||||
IPage<OrgAllInfoApiEntity> list = orgApplyInfoApi.queryOrgAllInfo(pageNo, pageSize, orgCode, null);
|
||||
|
||||
List<OrgAllInfoApiEntity> records = list.getRecords();
|
||||
System.out.println("1111111111111111111:"+orgCode+"----------"+records);
|
||||
if (records == null || records.size() == 0) {
|
||||
return Result.ok(null);
|
||||
}
|
||||
|
|
@ -196,11 +198,13 @@ public class ElderApi {
|
|||
JSONObject orgInfo = null;
|
||||
try {
|
||||
orgInfo = sysBaseAPI.getOrgInfo(orgCode, "payable_amount");
|
||||
System.out.println("2222222222222222222222:"+orgInfo);
|
||||
} finally {
|
||||
DynamicDataSourceContextHolder.clear();
|
||||
}
|
||||
if (orgInfo != null && StringUtils.isNotBlank(orgInfo.getString("payableAmount"))) {
|
||||
result.setPayableAmount(new BigDecimal(orgInfo.getString("payableAmount")));
|
||||
System.out.println("2222222222222222222222:"+orgInfo);
|
||||
} else {
|
||||
return Result.ok(null);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2040,7 +2040,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
|
|||
user.setStatus(1);
|
||||
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
||||
//用户表字段org_code不能在这里设置他的值
|
||||
user.setOrgCode(null);
|
||||
// user.setOrgCode(null);//这设置为空导致用户orgCode为空,后续也没找到哪里设置这个值 modify by caolei 2026-03-24
|
||||
dataSourceLoader.refreshDataSources();
|
||||
// 保存用户走一个service 保证事务
|
||||
//获取租户ids
|
||||
|
|
|
|||
Loading…
Reference in New Issue