From c8ad6f13c0e9cbff9a0763bc50c86576449f6e03 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 一月 2024 08:57:51 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 15ba46b..25f67a1 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -448,7 +448,7 @@
if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>();
+ /*MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>();
csWrapper.selectAll(CompanySolution.class);
csWrapper.selectAs(Solutions::getName,CompanySolution::getSolutionName);
csWrapper.leftJoin(Solutions.class,Solutions::getId,CompanySolution::getSolutionBaseId);
@@ -456,7 +456,7 @@
csWrapper.eq(CompanySolution::getIsdeleted,Constants.ZERO);
csWrapper.orderByAsc(CompanySolution::getSortnum);
model.setSolutionList(companySolutionJoinMapper.selectJoinList(CompanySolution.class,csWrapper));
-
+*/
initImgData(model);
return model;
}
@@ -609,7 +609,12 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(pageWrap.getModel().getQueryFlag() == 0){
//鍙兘鐪嬫潈闄愯寖鍥村唴
- queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ queryWrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
+// queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
} else if (pageWrap.getModel().getQueryFlag() == 1) {
//鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
--
Gitblit v1.9.3