|
@@ -385,15 +385,11 @@ public class AdminUserLogic {
|
|
|
adminUser.setType(1);
|
|
|
} else {
|
|
|
if (!addWebsit) {
|
|
|
- if (!curAdminUser.getType().equals(AdminWebsitTypeEnum.A.getKey()) && StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.A.getKey())) {
|
|
|
+ if (curAdminUser.getType() != 2 && StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.A.getKey())) {
|
|
|
throw new RemoteServiceException("暂无权限创建当前网点的账号");
|
|
|
}
|
|
|
if (StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.C.getKey())) {
|
|
|
adminUser.setType(0);
|
|
|
- } else if (StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.B.getKey())) {
|
|
|
- adminUser.setType(1);
|
|
|
- } else if (StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.A.getKey())) {
|
|
|
- adminUser.setType(2);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -402,7 +398,7 @@ public class AdminUserLogic {
|
|
|
if (!addWebsit && !CollectionUtils.isEmpty(adminUser.getAdminDeptId())) {
|
|
|
AdminDept adminDept = adminDeptService.getById(adminUser.getAdminDeptId().get(0));
|
|
|
|
|
|
- if (!curAdminUser.getType().equals("2") && adminDept.getAdminDeptId().equals("1")) {
|
|
|
+ if (curAdminUser.getType() != 2 && adminDept.getAdminDeptId().equals("1")) {
|
|
|
throw new RemoteServiceException("不可选高于商户得平台权限");
|
|
|
}
|
|
|
|