diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java index 5450290..1542309 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java @@ -231,8 +231,9 @@ public class TSBizRemListServiceImpl extends ServiceImpl map = new HashMap<>(); - String areaName = Constant.GZ_REGION_CODE.get(tsWritModel.getAreaCode()); - areaName = areaName.contains("广州市") ? areaName : ("广州市" + areaName); + String areaNameq = Constant.GZ_REGION_CODE.get(tsWritModel.getAreaCode()); + String nmSareaName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00"); + String areaName = nmSareaName + areaNameq; map.put("areaName", areaName); map.put("writsNo", tsWritModel.getWritsno()); map.put("htmlContent", tsWritModel.getContent()); diff --git a/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java b/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java index c89ff86..c453dbc 100644 --- a/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java +++ b/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java @@ -654,6 +654,18 @@ public class UserController extends BaseController { @ApiOperation("获取当前部门的权限列表人") @GetMapping("/listUserByPermissionAndOrgIds") public RestResult> listUserByPermissionAndOrgIds(String permission, String orgId, Boolean isArea, HttpServletRequest request) { + AICUser loginUser = getLoginUser(request); + List userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser); + return RestResult.ok(userList); + } + + /** + * 获取严重违法当前部门的权限列表人 + * isArea = true 同时也查询出区的 + */ + @ApiOperation("获取当前部门的权限列表人") + @GetMapping("/listUserByPermissionAndOrgIdsYzwf") + public RestResult> listUserByPermissionAndOrgIdsYzwf(String permission, String orgId, Boolean isArea, HttpServletRequest request) { AICUser loginUser = getLoginUser(request); orgId = loginUser.getOrgID().substring(0, 4) + "00"; List userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser);