Skip to content

A
amos-boot-biz
Commit d90b7d12 authored by tianyiming's avatar tianyiming
Browse files
Options

fix(core): 调整officeRegion赋值

parent 94230c7c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ d90b7d12
...@@ -211,8 +211,7 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -211,8 +211,7 @@ public class TzBaseEnterpriseInfoServiceImpl
.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey())); .seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
if (result.getResult() != null) { if (result.getResult() != null) {
tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode()); tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.baseMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().lambda().eq(TzBaseEnterpriseInfo::getOrgCode, result.getResult().getOrgCode())); tzBaseEnterpriseInfoDto.setOfficeRegionStr(result.getResult().getCompanyCode());
tzBaseEnterpriseInfoDto.setOfficeRegionStr(tzBaseEnterpriseInfo.getOfficeRegion());
} }
} }
Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize()); Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
...@@ -222,8 +221,7 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -222,8 +221,7 @@ public class TzBaseEnterpriseInfoServiceImpl
if (!ValidationUtil.isEmpty(companyType1)) { if (!ValidationUtil.isEmpty(companyType1)) {
JSONObject companyTypeJson = companyType1.get(0); JSONObject companyTypeJson = companyType1.get(0);
orgCode = companyTypeJson.getString("orgCode"); orgCode = companyTypeJson.getString("orgCode");
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.baseMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().lambda().eq(TzBaseEnterpriseInfo::getOrgCode, orgCode)); officeRegion = companyTypeJson.getString("companyCode");
if(!ObjectUtils.isEmpty(tzBaseEnterpriseInfo)) officeRegion = tzBaseEnterpriseInfo.getOfficeRegion();
} }
// if (!ValidationUtil.isEmpty(companyType1)) { // if (!ValidationUtil.isEmpty(companyType1)) {
// for (JSONObject jsonObject : 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