From 19c793509b4853db97cc65200008b584419ab43d Mon Sep 17 00:00:00 2001 From: lwd <466279616@qq.com> Date: Sun, 4 Jan 2026 20:28:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=A5=E9=87=8D=E8=BF=9D?= =?UTF-8?q?=E6=B3=95=E8=A1=8C=E6=94=BF=E5=A4=84=E7=BD=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aiccs/common/constant/Constant.java | 67 +++++++++++-------- .../aiccs/org/controller/UserController.java | 1 + 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/common/constant/Constant.java b/src/main/java/com/chinaweal/aiccs/common/constant/Constant.java index d6341df..57a107a 100644 --- a/src/main/java/com/chinaweal/aiccs/common/constant/Constant.java +++ b/src/main/java/com/chinaweal/aiccs/common/constant/Constant.java @@ -309,38 +309,47 @@ public abstract class Constant { NM_REGION_CODE.put("155900", "乌兰察布市"); NM_REGION_CODE.put("157900", "阿拉善盟"); - GZ_REGION_CODE_SHORTNAME.put("440101","穗"); - GZ_REGION_CODE_SHORTNAME.put("440100","穗"); - GZ_REGION_CODE_SHORTNAME.put("440103","荔"); - GZ_REGION_CODE_SHORTNAME.put("440104","越"); - GZ_REGION_CODE_SHORTNAME.put("440105","海"); - GZ_REGION_CODE_SHORTNAME.put("440106","天"); - GZ_REGION_CODE_SHORTNAME.put("440111","白"); - GZ_REGION_CODE_SHORTNAME.put("440112","黄"); - GZ_REGION_CODE_SHORTNAME.put("440113","番"); - GZ_REGION_CODE_SHORTNAME.put("440126","番"); - GZ_REGION_CODE_SHORTNAME.put("440114","花"); - GZ_REGION_CODE_SHORTNAME.put("440121","花"); - GZ_REGION_CODE_SHORTNAME.put("440115","南"); - GZ_REGION_CODE_SHORTNAME.put("440110","南"); - GZ_REGION_CODE_SHORTNAME.put("440117","从"); - GZ_REGION_CODE_SHORTNAME.put("440122","从"); - GZ_REGION_CODE_SHORTNAME.put("440118","增"); - GZ_REGION_CODE_SHORTNAME.put("440125","增"); + GZ_REGION_CODE_SHORTNAME.put("150100", "呼"); + GZ_REGION_CODE_SHORTNAME.put("150200", "包"); + GZ_REGION_CODE_SHORTNAME.put("150300", "乌"); + GZ_REGION_CODE_SHORTNAME.put("150400", "赤"); + GZ_REGION_CODE_SHORTNAME.put("150500", "通"); + GZ_REGION_CODE_SHORTNAME.put("150600", "鄂"); + GZ_REGION_CODE_SHORTNAME.put("150700", "呼伦"); + GZ_REGION_CODE_SHORTNAME.put("150800", "巴"); + GZ_REGION_CODE_SHORTNAME.put("150900", "乌兰"); + GZ_REGION_CODE_SHORTNAME.put("152200", "兴安"); + GZ_REGION_CODE_SHORTNAME.put("152300", "包"); + GZ_REGION_CODE_SHORTNAME.put("152500", "锡林"); + GZ_REGION_CODE_SHORTNAME.put("152900", "阿拉"); + GZ_REGION_CODE_SHORTNAME.put("155100", "呼"); + GZ_REGION_CODE_SHORTNAME.put("155500", "通"); + GZ_REGION_CODE_SHORTNAME.put("155600", "鄂"); + GZ_REGION_CODE_SHORTNAME.put("155900", "乌兰"); + GZ_REGION_CODE_SHORTNAME.put("157900", "阿拉"); // GZ_DECORG_CODE.put("44010000", "广州市"); - GZ_DECORG_CODE.put("44010300", "荔湾"); - GZ_DECORG_CODE.put("44010400", "越秀"); - GZ_DECORG_CODE.put("44010500", "海珠"); - GZ_DECORG_CODE.put("44010600", "天河"); - GZ_DECORG_CODE.put("44011100", "白云"); - GZ_DECORG_CODE.put("44011200", "黄埔"); - GZ_DECORG_CODE.put("44012600", "番禺"); - GZ_DECORG_CODE.put("44012100", "花都"); - GZ_DECORG_CODE.put("44099000", "南沙"); - GZ_DECORG_CODE.put("44012200", "从化"); - GZ_DECORG_CODE.put("44012500", "增城"); + + + GZ_DECORG_CODE.put("15010000", "呼和浩特市"); + GZ_DECORG_CODE.put("15020000", "包头市"); + GZ_DECORG_CODE.put("15030000", "乌海市"); + GZ_DECORG_CODE.put("15040000", "赤峰市"); + GZ_DECORG_CODE.put("15050000", "通辽市"); + GZ_DECORG_CODE.put("15060000", "鄂尔多斯市"); + GZ_DECORG_CODE.put("15070000", "呼伦贝尔市"); + GZ_DECORG_CODE.put("15080000", "巴彦淖尔市"); + GZ_DECORG_CODE.put("15090000", "乌兰察布市"); + GZ_DECORG_CODE.put("15220000", "兴安盟"); + GZ_DECORG_CODE.put("15230000", "包头市"); + GZ_DECORG_CODE.put("15250000", "锡林郭勒盟"); + GZ_DECORG_CODE.put("15290000", "阿拉善盟"); + GZ_DECORG_CODE.put("15510000", "呼和浩特市"); + GZ_DECORG_CODE.put("15550000", "通辽市"); + GZ_DECORG_CODE.put("15560000", "鄂尔多斯市"); + GZ_DECORG_CODE.put("15590000", "乌兰察布市"); + GZ_DECORG_CODE.put("15790000", "阿拉善盟"); REPAIR_ILLEGAL_DEADLINE.put(REPAIR_ILLEGAL_DEADLINE_ACCEPT,"4"); REPAIR_ILLEGAL_DEADLINE.put(REPAIR_ILLEGAL_DEADLINE_HANDLE,"3"); 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 c846efd..c89ff86 100644 --- a/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java +++ b/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java @@ -655,6 +655,7 @@ public class UserController extends BaseController { @GetMapping("/listUserByPermissionAndOrgIds") public RestResult> listUserByPermissionAndOrgIds(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); return RestResult.ok(userList); }