From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java | 110 +++++++++++++++++++++++++++++-------------------------
1 files changed, 59 insertions(+), 51 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java
index 4229d86..4fec71a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java
@@ -8,6 +8,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.CompanyPermissionMapper;
+import com.doumee.dao.business.join.CompanyPermissionJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyPermission;
import com.doumee.dao.system.SystemUserMapper;
@@ -17,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -24,6 +26,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 绠＄悊鍛樼鐞嗕紒涓氭潈闄怱ervice瀹炵幇
@@ -36,46 +39,55 @@
@Autowired
private CompanyPermissionMapper companyPermissionMapper;
@Autowired
+ private CompanyPermissionJoinMapper companyPermissionJoinMapper;
+ @Autowired
private SystemUserMapper systemUserMapper;
@Autowired
private CompanyMapper companyMapper;
@Override
public Integer create(CompanyPermission companyPermission) {
- if(companyPermission.getUserId() == null || companyPermission.getCompanyIdList() == null || companyPermission.getCompanyIdList().size()==0){
+ if(companyPermission.getUserId() == null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
SystemUser user =systemUserMapper.selectById(companyPermission.getUserId());
if(user == null || (user.getDeleted() !=null && user.getDeleted())){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紝璇峰皾璇曞埛鏂伴〉闈㈤噸璇曪紒");
}
- List<Company> companieList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
- .in(Company::getId,companyPermission.getCompanyIdList())
- .eq(Company::getIsdeleted, Constants.ZERO));
-
- if(companieList == null || companieList.size() == 0){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨鏈夋晥浼佷笟锛岃灏濊瘯鍒锋柊椤甸潰閲嶈瘯锛�");
- }
- Date date = new Date();
- List<CompanyPermission> list = new ArrayList<>();
- for(Company c : companieList){
- CompanyPermission model = new CompanyPermission();
- model.setCompanyId(c.getId());
- model.setIsdeleted(Constants.ZERO);
- model.setIsdeleted(Constants.ZERO);
- model.setCreator(user.getId());
- model.setUserId(companyPermission.getUserId());
- model.setCreateDate(date);
- list.add(model);
- }
//鍒櫎鍘熸湁鐨勶紝鍦ㄦ壒閲忔彃鍏ユ柊鐨�
companyPermissionMapper.delete(new QueryWrapper<CompanyPermission>().lambda().eq(CompanyPermission::getUserId,companyPermission.getUserId()));
- companyPermissionMapper.insertBatchSomeColumn(list);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(companyPermission.getCompanyIdList())){
+ List<Company> companieList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
+ .in(Company::getId,companyPermission.getCompanyIdList())
+ .eq(Company::getIsdeleted, Constants.ZERO));
+
+ if(companieList == null || companieList.size() == 0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨鏈夋晥浼佷笟锛岃灏濊瘯鍒锋柊椤甸潰閲嶈瘯锛�");
+ }
+ Date date = new Date();
+ List<CompanyPermission> list = new ArrayList<>();
+ for(Company c : companieList){
+ CompanyPermission model = new CompanyPermission();
+ model.setCompanyId(c.getId());
+ model.setIsdeleted(Constants.ZERO);
+ model.setIsdeleted(Constants.ZERO);
+ model.setCreator(user.getId());
+ model.setUserId(companyPermission.getUserId());
+ model.setType(Constants.ZERO);
+ model.setCreateDate(date);
+ list.add(model);
+ }
+ companyPermissionMapper.insertBatchSomeColumn(list);
+ }
return companyPermission.getId();
}
@Override
public void deleteById(Integer id) {
+ CompanyPermission companyPermission = companyPermissionMapper.selectById(id);
+ if(Objects.nonNull(companyPermission)&&Constants.equalsInteger(companyPermission.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"姝ょ被鏁版嵁鏃犳硶杩涜鍒犻櫎:鍩虹鏉冮檺");
+ }
companyPermissionMapper.deleteById(id);
}
@@ -97,6 +109,7 @@
public void updateById(CompanyPermission companyPermission) {
companyPermissionMapper.updateById(companyPermission);
}
+
@Override
public void updateByIdInBatch(List<CompanyPermission> companyPermissions) {
@@ -121,43 +134,26 @@
@Override
public List<CompanyPermission> findList(CompanyPermission companyPermission) {
- QueryWrapper<CompanyPermission> wrapper = new QueryWrapper<>(companyPermission);
+ QueryWrapper<CompanyPermission> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(CompanyPermission::getIsdeleted,Constants.ZERO);
+ wrapper.lambda().eq(Objects.nonNull(companyPermission) && Objects.nonNull(companyPermission.getUserId())
+ ,CompanyPermission::getUserId,companyPermission.getUserId());
+ wrapper.lambda().orderByAsc(CompanyPermission::getId);
return companyPermissionMapper.selectList(wrapper);
}
@Override
public PageData<CompanyPermission> findPage(PageWrap<CompanyPermission> pageWrap) {
IPage<CompanyPermission> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<CompanyPermission> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<CompanyPermission> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(CompanyPermission::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(CompanyPermission::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(CompanyPermission::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(CompanyPermission::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(CompanyPermission::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(CompanyPermission::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(CompanyPermission::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(CompanyPermission::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(CompanyPermission::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(CompanyPermission::getCompanyId, pageWrap.getModel().getCompanyId());
- }
+ queryWrapper.selectAll(CompanyPermission.class);
+ queryWrapper.select(" t1.USERNAME as userName,t1.REALNAME as realName ,t1.mobile, t2.name as companyName , t3.realName as auditName ");
+ queryWrapper.leftJoin(" system_user t1 on t1.id = t.user_id ");
+ queryWrapper.leftJoin(" company t2 on t2.id = t.company_id ");
+ queryWrapper.leftJoin(" system_user t3 on t3.id = t.creator ");
if (pageWrap.getModel().getUserId() != null) {
- queryWrapper.lambda().eq(CompanyPermission::getUserId, pageWrap.getModel().getUserId());
+ queryWrapper.eq(CompanyPermission::getUserId, pageWrap.getModel().getUserId());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -166,7 +162,7 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(companyPermissionMapper.selectPage(page, queryWrapper));
+ return PageData.from(companyPermissionJoinMapper.selectPage(page, queryWrapper));
}
@Override
@@ -174,4 +170,16 @@
QueryWrapper<CompanyPermission> wrapper = new QueryWrapper<>(companyPermission);
return companyPermissionMapper.selectCount(wrapper);
}
+
+ @Override
+ public List<CompanyPermission> getUserCompanyPermission(Integer userId) {
+ return companyPermissionJoinMapper.selectJoinList(CompanyPermission.class,new MPJLambdaWrapper<CompanyPermission>()
+ .selectAll(CompanyPermission.class)
+ .selectAs(Company::getName,CompanyPermission::getCompanyName)
+ .leftJoin(Company.class,Company::getId,CompanyPermission::getCompanyId)
+ .eq(CompanyPermission::getUserId,userId)
+ .eq(CompanyPermission::getIsdeleted,Constants.ZERO)
+ );
+ }
+
}
--
Gitblit v1.9.3