|
@@ -358,16 +358,16 @@ public class AdminUserLogic {
|
|
|
if (StringUtils.isBlank(adminUser.getUserName()) || StringUtils.isBlank(adminUser.getPassword())) {
|
|
|
throw new RemoteServiceException("参数错误");
|
|
|
}
|
|
|
- if (Objects.nonNull(adminUser.getIsVender())
|
|
|
- && adminUser.getIsVender()
|
|
|
- && StringUtils.isBlank(adminUser.getVenderId())) {
|
|
|
- throw new RemoteServiceException("请选择供应商");
|
|
|
- }
|
|
|
// 网点账号供应商不能选
|
|
|
if (curAdminUser.getType() == 0) {
|
|
|
adminUser.setIsVender(false)
|
|
|
.setVenderId(null);
|
|
|
}
|
|
|
+ if (Objects.nonNull(adminUser.getIsVender())
|
|
|
+ && adminUser.getIsVender()
|
|
|
+ && StringUtils.isBlank(adminUser.getVenderId())) {
|
|
|
+ throw new RemoteServiceException("请选择供应商");
|
|
|
+ }
|
|
|
Integer count = adminUserService.lambdaQuery().eq(AdminUser::getUserName, adminUser.getUserName()).count();
|
|
|
if (count > 0) {
|
|
|
throw new RemoteServiceException("帐号已被注册");
|