From c0b565cf340fb38d4cf62b920cadbd9b6f992641 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 17:26:35 +0800
Subject: [PATCH] 开发
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index dee67ff..446eac4 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -112,9 +112,10 @@
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(systemUser.getUsername());
queryUserDto.setDeleted(Boolean.FALSE);
+ queryUserDto.setType(Constants.ZERO);
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
}
// 楠岃瘉宸ュ彿
if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
@@ -175,7 +176,7 @@
queryUserDto.setDeleted(Boolean.FALSE);
user = systemUserService.findOne(queryUserDto);
if (user != null && !user.getId().equals(systemUser.getId())) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
}
}
@@ -250,7 +251,7 @@
queryUserDto.setDeleted(Boolean.FALSE);
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
}
if(createCompanyUserDTO.getType().equals(Constants.UserType.ZHUBO.getKey())){
Company company = companyService.findById(loginUserInfo.getCompanyId());
@@ -258,8 +259,10 @@
zbUserNum.setCompanyId(loginUserInfo.getCompanyId());
zbUserNum.setDeleted(Boolean.FALSE);
zbUserNum.setType(Constants.UserType.ZHUBO.getKey());
- if(systemUserService.findList(zbUserNum).size()>=company.getUserNum()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝宸茶秴鍑轰紒涓氬彲鍒嗛厤涓绘挱鏁伴噺锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
+ if(!Objects.isNull(company.getUserNum())&&company.getUserNum()!=Constants.ZERO){
+ if(systemUserService.findList(zbUserNum).size()>=company.getUserNum()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝宸茶秴鍑轰紒涓氬彲鍒嗛厤涓绘挱鏁伴噺锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
+ }
}
}
SystemUser systemUser = new SystemUser();
--
Gitblit v1.9.3