From cf3eb8aade51e277d6d732e28e89f64ac3adca6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 八月 2023 16:19:51 +0800
Subject: [PATCH] 大屏
---
server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java b/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
index f4a8a20..e3ac14e 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
@@ -325,10 +325,12 @@
cu.setDeleted(Constants.ZERO);
cu.setCreateTime(date);
cu.setCode("NO."+userParam.getPhone());
+ cu.setIsMaster(com.getIsNew());//鏄惁涓昏处鍙�
cu.setPhoneAuthStatus(Constants.ZERO+"");
cu.setQrcodeid(barcodeParamExtService.getByType(com.getId(),com.getRootDepartment().getId(),Constants.BARCODEPARAM_TYPE.user)+"");
cu.setComDepartId(com.getRootDepartment().getId());
cu.setDepartmentId(com.getRootDepartment().getId());
+ cu.setOrigin(userParam.getOrigin());
if(userParam.getOrigin() == Constants.COMPANY_ORIGIN.lingyang){
cu.setLingyangUserid(userParam.getUserId());
}else if(userParam.getOrigin() == Constants.COMPANY_ORIGIN.edgp){
@@ -463,7 +465,6 @@
if(srList!=null && srList.size()>0){
List<SystemUserRole> urList = new ArrayList<>();
for(SystemRole tr :srList){
-
SystemUserRole userRole = new SystemUserRole();
userRole.setUserId(cu.getUserId());
userRole.setDeleted(false);
@@ -473,7 +474,7 @@
userRole.setCreateTime(userRole.getInvalidTime());
userRole.setRemark("缇氱緤浼佷笟鐢熸垚鑷姩瀵煎叆");
urList.add(userRole);
-// systemUserRoleMapper.insert(userRole);
+// systemUserRoleMapper.insert(userRole);
}
systemRoleMapper.insertRoleUserBatch(urList);
}
@@ -541,6 +542,14 @@
CompanyUser cu = new CompanyUser();
cu.setDeleted(Constants.ZERO);
cu.setRootDepartId(loginUser.getRootDepartment().getId());
+ //闄愬埗浜烘暟
+ int limitUserNum = Constants.formatIntegerNum(loginUser.getCompany().getOpenUserNum());
+ if(limitUserNum > 0){
+ //浜烘暟闄愬埗杈撳叆0锛岃〃绀轰笉闄愬埗浜烘暟
+ if(companyUserExtMapper.selectCount(new QueryWrapper<>(cu)) +1 > limitUserNum ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛鏁伴噺瓒呰繃璐拱鏁伴噺锛岃鑱旂郴涓氬姟缁忕悊缁喘!");
+ }
+ }
if(user ==null){
//濡傛灉鐢ㄦ埛璐﹀彿涓嶅瓨鍦紝鏂板鐢ㄦ埛
// 鐢熸垚瀵嗙爜鐩�
@@ -561,10 +570,14 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙峰凡瀛樺湪锛�");
}
}
- cu.setCode(systemUser.getEmpNo());
- if(companyUserService.findOne(cu) !=null){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
+ //瀛樺湪宸ュ彿闇�瑕佸敮涓�鍒ゆ柇
+ if (StringUtils.isNotBlank(systemUser.getEmpNo())){
+ cu.setCode(systemUser.getEmpNo());
+ if(companyUserService.findOne(cu) !=null){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
+ }
}
+
cu.setUserId(userId);
cu.setComDepartId(loginUser.getComDepartment().getId());
cu.setCreateUser(loginUser.getId());
@@ -680,6 +693,8 @@
if (codeUser != null && !codeUser.getId().equals(cu.getId())) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
}
+ }else if (StringUtils.isBlank(systemUser.getEmpNo())) {
+ u.setCode(systemUser.getEmpNo());
}
u.setId(cu.getId());
u.setName(systemUser.getRealname());
--
Gitblit v1.9.3