From 4dc8265d815f9a2fd9fef41d6e526c2f6d9b318c Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Sat, 4 Apr 2026 13:37:05 +0800
Subject: [PATCH] =?UTF-8?q?superRole=3D1=E7=9A=84=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7=E4=BC=81=E4=B8=9A=E5=BD=92?=
 =?UTF-8?q?=E5=B1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/service/impl/UserServiceImpl.java           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/impl/UserServiceImpl.java b/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/impl/UserServiceImpl.java
index 1ced14e..6e79c80 100644
--- a/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/impl/UserServiceImpl.java
+++ b/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/impl/UserServiceImpl.java
@@ -222,9 +222,14 @@ public class UserServiceImpl implements UserService {
 //			}
 //			if (1 != companyId.intValue()) {//非顶级账号
 //				param.setCompanyId(companyId);
-//			} else 
-			if (null == param.getCompanyId()) {//admin账号必须能选择企业归属
-				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "companyId is required");
+//			} else if (null == param.getCompanyId()) {//admin账号必须能选择企业归属
+//				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "companyId is required");
+//			}
+			BasicUser userInfo = basicUserMapperExt.selectByPrimaryKey(userId);
+			if (1 == userInfo.getSuperRole()) {//admin账号必须能选择企业归属
+				if (null == param.getCompanyId()) {
+					return new SimpleDataResponse(ResponseCode.MSG_ERROR, "companyId is required");
+				}
 			}
     		//校验参数
 			SimpleDataResponse checkResult = checkParam(param, languageType);