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

部门修改bug

Browse Source
This commit is contained in:
雨木c
2023-10-31 14:39:36 +08:00
parent 473cf06ba3
commit 8e4fc1b70c
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
View File

@@ -93,9 +93,9 @@ public class DeptController extends BaseController {
@ApiImplicitParam(name = "id",value = "区域id"),
@ApiImplicitParam(name = "type", value = "区域类型", required = true)
})
public HttpResult<List<Area>> getPidAreaByAreaId(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) {
public HttpResult<List<AreaTreeDTO>> getPidAreaByAreaId(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) {
String methodDescribe = getMethodDescribe("getAreaTree");
List<Area> result = deptService.getPidAreaByAreaId(id,type);
List<AreaTreeDTO> result = deptService.getPidAreaByAreaId(id,type);
if (!result.isEmpty()) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} else {

2
pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
View File

@@ -83,7 +83,7 @@ public interface IDeptService extends IService<Dept> {
*/
List<AreaTreeDTO> getAreaTree(String id, Integer type);
List<Area> getPidAreaByAreaId(String id, Integer type);
List<AreaTreeDTO> getPidAreaByAreaId(String id, Integer type);
/**

17
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
View File

@@ -215,15 +215,22 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
@Override
public List<Area> getPidAreaByAreaId(String id, Integer type) {
public List<AreaTreeDTO> getPidAreaByAreaId(String id, Integer type) {
List<AreaTreeDTO> result = new ArrayList<>();
List<String> deptBindAreaList = deptArea();
List<Area> areaList = areaFeignClient.getPidAreaList(id, type).getData();
areaList = areaList.stream().peek(item->{
areaList.forEach(item->{
AreaTreeDTO areaTreeDTO = new AreaTreeDTO();
if(deptBindAreaList.contains(item.getId())){
item.setName(item.getName() + "(已被绑定)");
areaTreeDTO.setName(item.getName() + "(已被绑定)");
areaTreeDTO.setIsFalse(1);
}else {
areaTreeDTO.setName(item.getName());
areaTreeDTO.setIsFalse(0);
}
}).collect(Collectors.toList());
return areaList;
result.add(areaTreeDTO);
});
return result;
}
@Override