Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码细节调整

Browse Source
This commit is contained in:
陈超
2022-08-08 10:28:07 +08:00
parent 3e6b7608a6
commit f7d1e6774a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java
View File

@@ -35,7 +35,7 @@ public class DeptMapServiceImpl implements DeptMapService {
@Override @Override
public List<DeptConfigVO> getDeptMapConfig() { public List<DeptConfigVO> getDeptMapConfig() {
List<DeptConfigVO> deptConfigVOS = new ArrayList<>(); List<DeptConfigVO> deptConfigVOS = new ArrayList<>();
List<DeptMap> deptMaps = deptMapMapper.selectList(new QueryWrapper<DeptMap>().eq("sys_dept_map.State",1)); List<DeptMap> deptMaps = deptMapMapper.selectList(new QueryWrapper<DeptMap>().eq("sys_dept_map.State",DataStateEnum.ENABLE.getCode()));
if (!CollectionUtils.isEmpty(deptMaps)) { if (!CollectionUtils.isEmpty(deptMaps)) {
List<String> deptIndexes = deptMaps.stream().map(DeptMap::getDeptId).collect(Collectors.toList()); List<String> deptIndexes = deptMaps.stream().map(DeptMap::getDeptId).collect(Collectors.toList());
List<Dept> deptList = deptMapMapper.selectDeptListName(deptIndexes); List<Dept> deptList = deptMapMapper.selectDeptListName(deptIndexes);
@@ -55,7 +55,7 @@ public class DeptMapServiceImpl implements DeptMapService {
public DeptConfigVO getDeptMapConfigById(String id) { public DeptConfigVO getDeptMapConfigById(String id) {
DeptConfigVO deptConfigVO = new DeptConfigVO(); DeptConfigVO deptConfigVO = new DeptConfigVO();
DeptMap deptMap = deptMapMapper.selectById(id); DeptMap deptMap = deptMapMapper.selectById(id);
if (!Objects.isNull(deptMap) && deptMap.getState()==1) { if (!Objects.isNull(deptMap) && deptMap.getState().equals(DataStateEnum.ENABLE.getCode())) {
BeanUtils.copyProperties(deptMap, deptConfigVO); BeanUtils.copyProperties(deptMap, deptConfigVO);
deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId())); deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId()));
return deptConfigVO; return deptConfigVO;
@@ -67,7 +67,7 @@ public class DeptMapServiceImpl implements DeptMapService {
public DeptConfigVO getConfigByDeptId(String deptId) { public DeptConfigVO getConfigByDeptId(String deptId) {
DeptConfigVO deptConfigVO = new DeptConfigVO(); DeptConfigVO deptConfigVO = new DeptConfigVO();
DeptMap deptMap = deptMapMapper.selectOne(new QueryWrapper<DeptMap>().eq("sys_dept_map.Dept_Id", deptId)); DeptMap deptMap = deptMapMapper.selectOne(new QueryWrapper<DeptMap>().eq("sys_dept_map.Dept_Id", deptId));
if (!Objects.isNull(deptMap) && deptMap.getState()==1) { if (!Objects.isNull(deptMap) && deptMap.getState().equals(DataStateEnum.ENABLE.getCode())) {
BeanUtils.copyProperties(deptMap, deptConfigVO); BeanUtils.copyProperties(deptMap, deptConfigVO);
deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId())); deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId()));
return deptConfigVO; return deptConfigVO;