wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-15 15:33:59 +08:00
parent 1eaa67a531 e572bd54fc
commit eb3bf1d96d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -2195,8 +2195,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
return resultList; return resultList;
} else { } else {
List<Map<String, Object>> typeCountListByApplyDept = resourceDao.selectApplyDeptDetailTypeCountList(params); List<Map<String, Object>> typeCountListByApplyDept = resourceDao.selectApplyDeptDetailTypeCountList(params);
List<HashMap<String, Object>> resultList = getDeptTemp1(); List<HashMap<String, Object>> resultList = new ArrayList<>();
resultList.addAll(getDeptTemp2()); resultList.addAll(getDeptTemp2());
resultList.addAll(getDeptTemp1());
resultList.addAll(getDeptTemp4()); resultList.addAll(getDeptTemp4());
Map<String, Integer> countMap = new HashMap<>(); Map<String, Integer> countMap = new HashMap<>();
@ -2381,9 +2382,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List<Map<String, Object>> typeCountListByDept = resourceDao.selectDeptDetailTypeCountList(params); List<Map<String, Object>> typeCountListByDept = resourceDao.selectDeptDetailTypeCountList(params);
Map<String, List<Map<String, Object>>> typeCountListMap = // 市级部门 Map<String, List<Map<String, Object>>> typeCountListMap = // 市级部门
typeCountListByDept.stream().filter(index -> index.get("deptType").toString().equals("2")).collect(Collectors.groupingBy(m -> m.get("dept_id").toString())); typeCountListByDept.stream().filter(index -> index.get("deptType").toString().equals("2")).collect(Collectors.groupingBy(m -> m.get("dept_id").toString()));
List<HashMap<String, Object>> resultList = getDeptTemp1(); List<HashMap<String, Object>> resultList = new ArrayList<>();
resultList.addAll(getDeptTemp2()); resultList.addAll(getDeptTemp2()); // 区级区域
resultList.addAll(getDeptTemp4()); resultList.addAll(getDeptTemp1()); // 市级部门
resultList.addAll(getDeptTemp4()); // 企业
Map<String, Integer> countMap = new HashMap<>(); Map<String, Integer> countMap = new HashMap<>();
resultList = resultList.stream().map(index -> { resultList = resultList.stream().map(index -> {
if (typeCountListMap.keySet().contains(index.get("dept_id").toString())) { // 该部门存在上架信息 if (typeCountListMap.keySet().contains(index.get("dept_id").toString())) { // 该部门存在上架信息

8
renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
View File

@ -94,12 +94,18 @@ public class SysDeptController {
} }
} else { // 区域管理员 } else { // 区域管理员
SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId()); SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
if (sysDeptDTO.getDistrict() != null) { if (sysDeptDTO != null && sysDeptDTO.getDistrict() != null) {
if (StringUtils.isNotEmpty(name)) { if (StringUtils.isNotEmpty(name)) {
list = jdbcTemplate.queryForList(String.format("SELECT id,`name` FROM sys_dept WHERE `name` LIKE '%s' AND WHERE district = %d;", "%" + name + "%", sysDeptDTO.getDistrict())); list = jdbcTemplate.queryForList(String.format("SELECT id,`name` FROM sys_dept WHERE `name` LIKE '%s' AND WHERE district = %d;", "%" + name + "%", sysDeptDTO.getDistrict()));
} else { } else {
list = jdbcTemplate.queryForList(String.format("SELECT id,`name` FROM sys_dept WHERE district = %d;", sysDeptDTO.getDistrict())); list = jdbcTemplate.queryForList(String.format("SELECT id,`name` FROM sys_dept WHERE district = %d;", sysDeptDTO.getDistrict()));
} }
} else {
if (StringUtils.isNotEmpty(name)) {
list = jdbcTemplate.queryForList(String.format("SELECT id,`name` FROM sys_dept WHERE `name` LIKE '%s';", "%" + name + "%"));
} else {
list = jdbcTemplate.queryForList("SELECT id,`name` FROM sys_dept;");
}
} }
} }
return new Result<List<Map<String, Object>>>().ok(list); return new Result<List<Map<String, Object>>>().ok(list);