修复农机具作业记录导出异常的bug

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsMachController.java

@@ -21,6 +21,7 @@ import com.yunfeiyun.agmp.fms.service.IFmsLandService;
 import com.yunfeiyun.agmp.fms.service.IFmsMachService;
 import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import com.yunfeiyun.agmp.fms.util.ExportUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -75,15 +76,13 @@ public class FmsMachController extends BaseController
     @PreAuthorize("@ss.hasPermi('fms:mach:record:list')")
     @GetMapping("/record/list")
     public TableDataInfo recordList(FmsMachRecordListReqVo fmsMachRecordListReqVo) {
-        fmsMachRecordListReqVo.setBlockIds(dataAuthUtil.blockList());
-        if(!dataAuthUtil.checkRole("warehouse_admin"))
-        {
-            fmsMachRecordListReqVo.setDataFilter(SecurityUtils.isValidate());
+        if(SecurityUtils.isValidate()) {
+            fmsMachRecordListReqVo.setBlockIds(dataAuthUtil.blockList());
+            if(CollectionUtils.isEmpty(fmsMachRecordListReqVo.getBlockIds())){
+                return getDataTable(new ArrayList<>());
+            }
         }
         startPage();
-        if(fmsMachRecordListReqVo.getDataFilter()&&fmsMachRecordListReqVo.getBlockIds().isEmpty()){
-            return getDataTable(new ArrayList<>());
-        }
         List<FmsMachRecordListResVo> list = fmsMachService.selectFmsMachRecordList(fmsMachRecordListReqVo);
         return getDataTable(list);
     }
@@ -110,13 +109,10 @@ public class FmsMachController extends BaseController
     @PostMapping("/record/export")
     public void recordExport(HttpServletResponse response,@RequestBody FmsMachRecordListReqVo fmsMachRecordListReqVo) {
         ExportUtil.checkTime(fmsMachRecordListReqVo.getStartDate(), fmsMachRecordListReqVo.getEndDate());
+        fmsMachRecordListReqVo.setTid(SecurityUtils.getTid());
         fmsMachRecordListReqVo.setBlockIds(dataAuthUtil.blockList());
-        if(!dataAuthUtil.checkRole("warehouse_admin"))
-        {
-            fmsMachRecordListReqVo.setDataFilter(SecurityUtils.isValidate());
-        }
         List<FmsMachRecordExcelVo> list = new ArrayList<>();
-        if(!(fmsMachRecordListReqVo.getDataFilter()&&fmsMachRecordListReqVo.getBlockIds().isEmpty())){
+        if(CollectionUtils.isNotEmpty(fmsMachRecordListReqVo.getBlockIds())){
             list = fmsMachService.selectFmsMachRecordExcelVoList(fmsMachRecordListReqVo);
         }
         for(int i = 1 ; i<=list.size();i++){

src/main/resources/mapper/FmsMachMapper.xml

@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endDate != null  and endDate != ''">
                 and tc.taskrcdCompletedate <![CDATA[ <= ]]>  #{endDate}
             </if>
-            <if test="dataFilter == true and blockIds != null and blockIds.size() > 0">
+            <if test="blockIds != null and blockIds.size() > 0">
                 AND t.blockId in
                 <foreach collection="blockIds" item="item" open="(" separator="," close=")">
                     #{item}