From cae3b043d8a8a08e176839d0c23a4432e5d9f5f4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 15:14:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java b/src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java
index df6a263..cb1571b 100644
--- a/src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java
@@ -17,6 +17,7 @@
package org.springblade.modules.rotation.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.rotation.entity.RotationEntity;
import org.springblade.modules.rotation.vo.RotationVO;
@@ -28,6 +29,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
/**
* 轮播图 服务实现类
@@ -51,11 +54,21 @@
*/
@Override
public IPage<RotationVO> selectRotationPage(IPage<RotationVO> page, RotationVO rotation) {
-// Dept dept = deptService.getById(AuthUtil.getDeptId());
-// if (null!=dept && !AuthUtil.isAdministrator()){
-// rotation.setRegionCode(dept.getRegionCode());
-// }
- return page.setRecords(baseMapper.selectRotationPage(page, rotation));
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(RotationVO.class,rotation);
+ List<RotationVO> rotationVOList = baseMapper.selectRotationPage(page, rotation,
+ commonParamSet.getIsAdministrator(),
+ null==commonParamSet.getRegionChildCodesList()?null:String.join("|",commonParamSet.getRegionChildCodesList()),
+ null==commonParamSet.getGridCodeList()?null:String.join("|",commonParamSet.getGridCodeList()));
+ if (rotationVOList.size()==0){
+ // 如果没有对应的轮播图，则采用系统默认的
+ rotation.setType(3);
+ rotationVOList = baseMapper.selectRotationPage(page,
+ rotation,
+ 1,
+ null==commonParamSet.getRegionChildCodesList()?null:String.join("|",commonParamSet.getRegionChildCodesList()),
+ null==commonParamSet.getGridCodeList()?null:String.join("|",commonParamSet.getGridCodeList()));
+ }
+ return page.setRecords(rotationVOList);
}
--
Gitblit v1.9.3