|
@@ -213,11 +213,8 @@ public class AdminUserLogic {
|
|
|
throw new RemoteServiceException("不允许修改账号");
|
|
|
}
|
|
|
|
|
|
- adminUser.setCompanyId("");
|
|
|
- adminUser.setCompanyName("");
|
|
|
-
|
|
|
if (curLoginAmin.getType() == 0 && adminUser.getType() != 0) {
|
|
|
- if (StringUtils.isBlank(adminUser.getCompanyId()) || StringUtils.isBlank(adminUser.getCompanyName()) ) {
|
|
|
+ if (StringUtils.isBlank(adminUser.getCompanyId()) || StringUtils.isBlank(adminUser.getCompanyName())) {
|
|
|
throw new RemoteServiceException("管理员创建“非平台账号”账号,必须指定所属公司");
|
|
|
}
|
|
|
}
|
|
@@ -250,6 +247,11 @@ public class AdminUserLogic {
|
|
|
adminUser.setCompanyName(curLoginAmin.getCompanyName());
|
|
|
}
|
|
|
|
|
|
+ if (StringUtils.isBlank(adminUser.getCompanyId())) {
|
|
|
+ adminUser.setCompanyId("");
|
|
|
+ adminUser.setCompanyName("");
|
|
|
+ }
|
|
|
+
|
|
|
// 检查角色
|
|
|
AdminRole addUserRole;
|
|
|
if (StringUtils.isEmpty(adminUser.getRoleId()) ||
|