fix

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDingMapper.java

@@ -32,7 +32,7 @@ public interface TBDingMapper extends BaseMapper<TBDing> {
 
     IPage<TBDingSubmitQueryResult> query(IPage<Map> iPage, @Param("serviceId") Long serviceId, @Param("status") String status, @Param("createId") Long createId, @Param("userName") String userName, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("days") Long days, @Param("dpr") DataPermissionDto dpr);
 
-    List<TBDingSubmitQueryResult> query(@Param("serviceId") Long serviceId, @Param("status") String status, @Param("createId") Long createId, @Param("userName") String userName, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("days") Long days);
+    List<TBDingSubmitQueryResult> query(@Param("serviceId") Long serviceId, @Param("status") String status, @Param("createId") Long createId, @Param("userName") String userName, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("days") Long days, @Param("dpr") DataPermissionDto dpr);
 
     TBDingCountResult count(@Param("serviceId") Long serviceId, @Param("createId") Long createId, @Param("userName") String userName, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("dpr") DataPermissionDto dpr);
 

sop-business/src/main/java/com/qmth/sop/business/service/TBDingService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.sop.business.bean.dto.DateFormDto;
 import com.qmth.sop.business.bean.params.DingSaveParam;
 import com.qmth.sop.business.bean.result.*;
+import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBDing;
 import com.qmth.sop.common.enums.DingResultEnum;
 import com.qmth.sop.common.enums.InOutTypeEnum;
@@ -60,7 +61,7 @@ public interface TBDingService extends IService<TBDing> {
      */
     IPage<TBDingSubmitQueryResult> query(IPage<Map> iPage, Long serviceId, String status, Long createId, String userName, Long supplierId, String custom, String sopNo, Long days);
 
-    List<TBDingSubmitQueryResult> query(Long serviceId, String status, Long createId, String userName, Long supplierId, String custom, String sopNo, Long days);
+    List<TBDingSubmitQueryResult> query(SysUser account, Long serviceId, String status, Long createId, String userName, Long supplierId, String custom, String sopNo, Long days);
 
     TBDingCountResult count(Long serviceId, Long createId, String userName, Long supplierId, String custom, String sopNo);
 

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingServiceImpl.java

@@ -395,8 +395,10 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
     }
 
     @Override
-    public List<TBDingSubmitQueryResult> query(Long serviceId, String status, Long createId, String userName, Long supplierId, String custom, String sopNo, Long days) {
-        return this.baseMapper.query(serviceId, status, createId, userName, supplierId, custom, sopNo, days);
+    public List<TBDingSubmitQueryResult> query(SysUser account, Long serviceId, String status, Long createId, String userName, Long supplierId, String custom, String sopNo, Long days) {
+        Long userId = account.getId();
+        DataPermissionDto dpr = sysUserService.buildUserDataPermission(userId);
+        return this.baseMapper.query(serviceId, status, createId, userName, supplierId, custom, sopNo, days,dpr);
     }
 
     @Override

sop-business/src/main/java/com/qmth/sop/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -327,7 +327,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         try {
             fileTemp = SystemConstant.getFileTempVar(SystemConstant.XLSX_PREFIX);
 
-            List<TBDingSubmitQueryResult> tbDingCountQueryResults = tbDingService.query((Long) map.get("serviceId"), (String) map.get("status"), (Long) map.get("createId"), (String) map.get("userName"), (Long) map.get("supplierId"), (String) map.get("String"), (String) map.get("sopNo"), (Long) map.get("days"));
+            List<TBDingSubmitQueryResult> tbDingCountQueryResults = tbDingService.query((SysUser)map.get("account"),(Long) map.get("serviceId"), (String) map.get("status"), (Long) map.get("createId"), (String) map.get("userName"), (Long) map.get("supplierId"), (String) map.get("String"), (String) map.get("sopNo"), (Long) map.get("days"));
 //            tbDingCountQueryResults.forEach(e -> {
 //                e.setStatus(FlowStatusEnum.convertToEnum(e.getStatus()).getTitle());
 //            });