dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-05-27 08:46:15 +08:00
commit 8a6a373981
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/ChainStoreInfoServiceImpl.java
View File

@ -55,7 +55,7 @@ public class ChainStoreInfoServiceImpl extends ServiceImpl<ChainStoreInfoMapper,
} }
String ancestors = sysDept.getAncestors(); String ancestors = sysDept.getAncestors();
if (!"0".equals(sysDept.getAncestors())) { if (!"0".equals(sysDept.getAncestors())) {
ancestors = sysDept.getAncestors()+sysDept.getDeptId(); ancestors = sysDept.getAncestors()+ "," +sysDept.getDeptId();
} }
IPage<ChainStoreInfo> res = baseMapper.listVo(page,chainStoreInfo,ancestors); IPage<ChainStoreInfo> res = baseMapper.listVo(page,chainStoreInfo,ancestors);

3
fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
View File

@ -224,7 +224,8 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
String roleId = param.get("roleIds").toString(); String roleId = param.get("roleIds").toString();
String accountName = param.get("accountName").toString(); String accountName = param.get("accountName").toString();
String accountStatus = param.get("accountStatus").toString(); String accountStatus = param.get("accountStatus").toString();
String realName = param.get("realName").toString(); String realName = "";
if (ObjectUtil.isNotEmpty(param.get("realName"))) realName = param.get("realName").toString();
String password = param.get("password").toString(); String password = param.get("password").toString();
String mobile = param.get("mobile").toString(); String mobile = param.get("mobile").toString();