From 4ac55b3e4ccd35aad6ce395222683fd80b1aab79 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 18:05:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
index 23965eb..7cda6d4 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -17,6 +18,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -94,6 +96,19 @@
IPage<Notices> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
+ if(loginUserInfo.getType().equals(Constants.ONE)){
+ queryWrapper.eq(Notices::getCompanyId, loginUserInfo.getCompanyId());
+ }else{
+ if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+ queryWrapper.in(Notices::getCompanyId, loginUserInfo.getCompanyIdList());
+ }else{
+ queryWrapper.eq(Notices::getCompanyId, -1);
+ }
+ }
+
queryWrapper.selectAll(Notices.class);
queryWrapper.selectAs(Company::getName,Notices::getCompanyName);
queryWrapper.leftJoin(Company.class,Company::getId,Notices::getCompanyId);
@@ -118,6 +133,19 @@
if (pageWrap.getModel().getReaded() != null) {
queryWrapper.eq(Notices::getReaded, pageWrap.getModel().getReaded());
}
+ if(pageWrap.getModel().getQueryType()!=null){
+ if(pageWrap.getModel().getQueryType().equals(Constants.ZERO)){
+ queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.INSURANCE_APPLY.getKey(),
+ Constants.NoticeObjectType.APPLY_CHANGE.getKey(),
+ Constants.NoticeObjectType.DISPATCH_UNIT.getKey(),
+ Constants.NoticeObjectType.CHANGE_FACTORY.getKey()});
+ } else if(pageWrap.getModel().getQueryType().equals(Constants.ONE)){
+ queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.TAXES.getKey() });
+ } else if(pageWrap.getModel().getQueryType().equals(Constants.TWO)){
+ queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.SETTLE_CLAIMS.getKey() });
+
+ }
+ }
if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
--
Gitblit v1.9.3