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);