lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

master
徐杰盟 2024-05-23 14:42:14 +08:00
parent 3c213a6a8a
commit b489f15b60
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java
View File

@ -58,7 +58,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
organization.setUnitDicts(unitDicts); organization.setUnitDicts(unitDicts);
String name = organization.getName(); String name = organization.getName();
if (name.contains("市") && name.contains("县")){ if (name.contains("市") && name.contains("县")){
organization.setAdinfoList(adinfoService.tree(adcd, null)); organization.setAdinfoList(adinfoService.tree(adcd, adcd));
} }
}); });

13
src/main/java/com/whdc/service/impl/UserServiceImpl.java
View File

@ -82,13 +82,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
if (Objects.nonNull(book)){ if (Objects.nonNull(book)){
String adcd = book.getAdcd(); String adcd = book.getAdcd();
if (StringUtils.isNotBlank(adcd)) { if (StringUtils.isNotBlank(adcd)) {
out.setAdcd(adcd);
if ("00000000000".equals(adcd.substring(4))) { // 市 if ("00000000000".equals(adcd.substring(4))) { // 市
out.setAdlevel(1); out.setAdlevel(1);
out.setAdcd(adcd.replace("00000000000",""));
} else if ("000000000".equals(adcd.substring(6))) { // 县 } else if ("000000000".equals(adcd.substring(6))) { // 县
out.setAdcd(adcd.replace("000000000",""));
out.setAdlevel(2); out.setAdlevel(2);
}else{
out.setAdcd(adcd);
} }
} }
out.setName(book.getName()); out.setName(book.getName());
} }
@ -194,12 +197,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
BeanUtils.copyProperties(sysUser, out); BeanUtils.copyProperties(sysUser, out);
String adcd = addressBook.getAdcd(); String adcd = addressBook.getAdcd();
if (StringUtils.isNotBlank(adcd)) { if (StringUtils.isNotBlank(adcd)) {
out.setAdcd(adcd);
if ("00000000000".equals(adcd.substring(4))) { // 市 if ("00000000000".equals(adcd.substring(4))) { // 市
out.setAdlevel(1); out.setAdlevel(1);
out.setAdcd(adcd.replace("00000000000",""));
} else if ("000000000".equals(adcd.substring(6))) { // 县 } else if ("000000000".equals(adcd.substring(6))) { // 县
out.setAdcd(adcd.replace("000000000",""));
out.setAdlevel(2); out.setAdlevel(2);
}else{
out.setAdcd(adcd);
} }
} }