Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api

# Conflicts:
#	src/main/java/com/chinaweal/aiccs/org/controller/UserController.java

src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java

@@ -231,8 +231,9 @@ public class TSBizRemListServiceImpl extends ServiceImpl<TSBizRemListMapper, TSB
 
                     // 生成决定书附件
                     HashMap<String, Object> 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());

src/main/java/com/chinaweal/aiccs/org/controller/UserController.java

@@ -659,6 +659,19 @@ public class UserController extends BaseController {
         return RestResult.ok(userList);
     }
 
+    /**
+     * 获取严重违法当前部门的权限列表人
+     * isArea = true 同时也查询出区的
+     */
+    @ApiOperation("获取当前部门的权限列表人")
+    @GetMapping("/listUserByPermissionAndOrgIdsYzwf")
+    public RestResult<List<AICUser>> listUserByPermissionAndOrgIdsYzwf(String permission, String orgId, Boolean isArea, HttpServletRequest request) {
+        AICUser loginUser = getLoginUser(request);
+        orgId = loginUser.getOrgID().substring(0, 4) + "00";
+        List<AICUser> userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser);
+        return RestResult.ok(userList);
+    }
+
     /**
      * 列异获取审核人
      */