Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 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);
   }