Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 a1d8ea1a72cddf7651742b87f042602ab006c879

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -17,6 +17,7 @@
package org.springblade.modules.task.service.impl;

import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.service.ITaskService;
@@ -30,7 +31,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * 报事报修任务表 服务实现类
@@ -44,6 +47,9 @@
   @Autowired
   private ITaskService taskService;

   @Autowired
   private IGridService gridService;

   /**
    * 自定义分页
    *
@@ -53,7 +59,14 @@
    */
   @Override
   public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs));
      List<String> list = new ArrayList<>();
      if (null!=taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")){
         if (taskReportForRepairs.getRoleName().equals("网格员")){
            // 查询对应的房屋地址code
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         }
      }
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
   }

   /**