From a2735382e853f89465e328dce2df9f3f465bcda9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 20 九月 2023 17:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 04ea0cb..e323532 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
@@ -7,11 +7,13 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.dto.*;
import com.doumee.dao.system.model.SystemDepartment;
import com.doumee.dao.system.model.SystemDepartmentUser;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.model.SystemUserRole;
+import com.doumee.service.business.CompanyService;
import com.doumee.service.system.*;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
@@ -32,6 +34,9 @@
@Autowired
private SystemUserService systemUserService;
+
+ @Autowired
+ private CompanyService companyService;
@Autowired
private SystemUserRoleService systemUserRoleService;
@@ -109,7 +114,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 (StringUtils.isNotBlank(systemUser.getEmpNo())) {
@@ -170,7 +175,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(), "鐧诲綍璐﹀彿宸插瓨鍦�");
}
}
@@ -245,7 +250,19 @@
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());
+ SystemUser zbUserNum = new SystemUser();
+ zbUserNum.setCompanyId(loginUserInfo.getCompanyId());
+ zbUserNum.setDeleted(Boolean.FALSE);
+ zbUserNum.setType(Constants.UserType.ZHUBO.getKey());
+ 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();
BeanUtils.copyProperties(createCompanyUserDTO,systemUser);
--
Gitblit v1.9.3