diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java index 10941b1cf..763f90408 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java @@ -35,7 +35,7 @@ public class DeptMapServiceImpl implements DeptMapService { @Override public List getDeptMapConfig() { List deptConfigVOS = new ArrayList<>(); - List deptMaps = deptMapMapper.selectList(new QueryWrapper().eq("sys_dept_map.State",1)); + List deptMaps = deptMapMapper.selectList(new QueryWrapper().eq("sys_dept_map.State",DataStateEnum.ENABLE.getCode())); if (!CollectionUtils.isEmpty(deptMaps)) { List deptIndexes = deptMaps.stream().map(DeptMap::getDeptId).collect(Collectors.toList()); List deptList = deptMapMapper.selectDeptListName(deptIndexes); @@ -55,7 +55,7 @@ public class DeptMapServiceImpl implements DeptMapService { public DeptConfigVO getDeptMapConfigById(String id) { DeptConfigVO deptConfigVO = new DeptConfigVO(); 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); deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId())); return deptConfigVO; @@ -67,7 +67,7 @@ public class DeptMapServiceImpl implements DeptMapService { public DeptConfigVO getConfigByDeptId(String deptId) { DeptConfigVO deptConfigVO = new DeptConfigVO(); DeptMap deptMap = deptMapMapper.selectOne(new QueryWrapper().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); deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId())); return deptConfigVO;