Commit d90b7d12 authored by tianyiming's avatar tianyiming

fix(core): 调整officeRegion赋值

parent 94230c7c
......@@ -211,8 +211,7 @@ public class TzBaseEnterpriseInfoServiceImpl
.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
if (result.getResult() != null) {
tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.baseMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().lambda().eq(TzBaseEnterpriseInfo::getOrgCode, result.getResult().getOrgCode()));
tzBaseEnterpriseInfoDto.setOfficeRegionStr(tzBaseEnterpriseInfo.getOfficeRegion());
tzBaseEnterpriseInfoDto.setOfficeRegionStr(result.getResult().getCompanyCode());
}
}
Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
......@@ -222,8 +221,7 @@ public class TzBaseEnterpriseInfoServiceImpl
if (!ValidationUtil.isEmpty(companyType1)) {
JSONObject companyTypeJson = companyType1.get(0);
orgCode = companyTypeJson.getString("orgCode");
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.baseMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().lambda().eq(TzBaseEnterpriseInfo::getOrgCode, orgCode));
if(!ObjectUtils.isEmpty(tzBaseEnterpriseInfo)) officeRegion = tzBaseEnterpriseInfo.getOfficeRegion();
officeRegion = companyTypeJson.getString("companyCode");
}
// if (!ValidationUtil.isEmpty(companyType1)) {
// for (JSONObject jsonObject : companyType1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment