From 2edf3f1fd9505cbdd435524d316e7558b25f6760 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 14:25:02 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
index ba394a1..112f4c5 100644
--- a/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
@@ -61,18 +61,22 @@
//璁剧疆鑼冨洿 0鐩村睘閮ㄩ棬鍛樺伐 1閮ㄩ棬鍙婂叾涓嬬骇甯冩仼鍛樺伐 2鎸囧畾浜哄憳
if(Constants.equalsInteger(managers.getIsMember(),Constants.ZERO) || Constants.equalsInteger(managers.getIsMember(),Constants.ONE)){
//鐩村睘閮ㄩ棬 鎴� 閮ㄩ棬鍙婂叾瀛愰儴闂�
- if(managers.getCompanyId() ==null ){
+ /* if(managers.getCompanyId() ==null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Company company = companyMapper.selectById(managers.getCompanyId());
if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝閮ㄩ棬淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }*/
+ if(managers.getCompanyIds() ==null || managers.getCompanyIds().size() ==0 ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
memberList =memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class)
.eq(Member::getIsdeleted,Constants.ZERO)
- .exists(Constants.equalsInteger(managers.getIsMember(),Constants.ZERO),"select (cm.id) from company_member cm where cm.company_id='"+company.getId()+"' and cm.member_id=t.id")
- .exists(Constants.equalsInteger(managers.getIsMember(),Constants.ONE),"select (cm.id) from company_member cm where cm.company_id_path like '"+company.getIdPath()+"%' and cm.member_id=t.id"));
+ .exists(Constants.equalsInteger(managers.getIsMember(),Constants.ZERO),"select (cm.id) from company_member cm where cm.company_id in ("+String.join(",",managers.getCompanyIds())+" ) and cm.member_id=t.id")
+// .exists(Constants.equalsInteger(managers.getIsMember(),Constants.ONE),"select (cm.id) from company_member cm where cm.company_id_path like '"+company.getIdPath()+"%' and cm.member_id=t.id")
+ );
}else{
if(managers.getMemberIds()==null || managers.getMemberIds().size()==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰閫夋嫨鎸囧畾鍛樺伐淇℃伅锛�");
@@ -86,16 +90,19 @@
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Date date = new Date();
for(Member m :memberList){
Managers mm = new Managers();
mm.setCreator(user.getId());
- mm.setCreateDate(new Date());
+ mm.setCreateDate(date);
mm.setIsdeleted(Constants.ZERO);
- mm.setEditor(managers.getCreator());
- mm.setEditDate(managers.getCreateDate());
+ mm.setEditor(mm.getCreator());
+ mm.setEditDate(mm.getCreateDate());
mm.setStatus(Constants.ZERO);
mm.setType(managers.getType());
mm.setMemberId(m.getId());
+ mm.setIsQw(managers.getIsQw());
+ mm.setIsEmail(managers.getIsEmail());
mm.setRemark(managers.getRemark());
memberIdList.add(m.getId());
newList.add(mm);
--
Gitblit v1.9.3