优化代码

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/BaosongTaskController.java

 package org.jeecg.modules.stm.baosong.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
@@ -208,7 +206,8 @@ public class BaosongTaskController extends JeecgController<BaosongTask, IBaosong
 	 public Result<BaosongTask> addApproval(@RequestBody BaosongTask task) {
 		QueryWrapper<BaosongTpl> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("tp",task.getTp());
-		List<BaosongTpl> tplList =	baosongTplService.list(queryWrapper);
+		List<BaosongTpl> tplList =	baosongTaskService.findUserRightForTpl(task.getId());
+
 		List<BaosongTaskReview> saveList = new ArrayList<>();
 		for(int i=0;i<tplList.size();i++) {
 			BaosongTpl tpl = tplList.get(i);
@@ -321,4 +320,6 @@ public class BaosongTaskController extends JeecgController<BaosongTask, IBaosong
 		baosongTaskRecordService.remove(queryRecordWrapper);
 	}
 
+
+
 }

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/BaosongTaskReviewController.java

@@ -122,7 +122,7 @@ public class BaosongTaskReviewController extends JeecgController<BaosongTaskRevi
 		if(baosongTaskReview.getAppSta()==2){
 			baosongTaskService.updateTaskSta(1,baosongTaskReview.getTaskid());
 		} else if(baosongTaskReview.getAppSta()==1){
-			baosongTaskService.updateTaskSta(5,baosongTaskReview.getTaskid());
+			baosongTaskService.updateTaskSta(4,baosongTaskReview.getTaskid());
 		} else if(baosongTaskReview.getAppSta()==9){
 			baosongTaskService.updateTaskSta(9,baosongTaskReview.getTaskid());
 		}

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/BaosongTplController.java

@@ -320,6 +320,4 @@ public class BaosongTplController extends JeecgController<BaosongTpl, IBaosongTp
 			return Result.error("查询失败，请稍后重试");
 		}
 	}
-
-
  }

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/entity/BaosongTask.java

@@ -44,8 +44,7 @@ public class BaosongTask implements Serializable {
      * 1初始 2已分配 3提交填报，4 提交审批，5 审批
      * */
 	@Excel(name = "报告状态", width = 15)
-
-    @Dict(dicCode = "fxc_report_sta")
+    //@Dict(dicCode = "fxc_report_sta")
     private java.lang.Integer sta;
 	/**报表类型*/
 	@Excel(name = "报表类型", width = 15)

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/service/IBaosongTaskService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.stm.baosong.service;
 
 import org.jeecg.modules.stm.baosong.entity.BaosongTask;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.stm.baosong.entity.BaosongTpl;
+
+import java.util.List;
 
 /**
  * @Description: 任务表
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBaosongTaskService extends IService<BaosongTask> {
     void updateTaskSta(Integer sta,Integer taskId);
+    List<BaosongTpl> findUserRightForTpl(Integer taskId);
 }

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/service/impl/BaosongTaskServiceImpl.java

 package org.jeecg.modules.stm.baosong.service.impl;
 
+import jakarta.servlet.http.HttpServletRequest;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.stm.baosong.entity.BaosongTask;
+import org.jeecg.modules.stm.baosong.entity.BaosongTaskAlloc;
+import org.jeecg.modules.stm.baosong.entity.BaosongTpl;
 import org.jeecg.modules.stm.baosong.mapper.BaosongTaskMapper;
+import org.jeecg.modules.stm.baosong.service.IBaosongTaskAllocService;
+import org.jeecg.modules.stm.baosong.service.IBaosongTaskReviewService;
 import org.jeecg.modules.stm.baosong.service.IBaosongTaskService;
+import org.jeecg.modules.stm.baosong.service.IBaosongTplService;
+import org.jeecg.modules.stm.utils.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * @Description: 任务表
  * @Author: jeecg-boot
@@ -15,6 +29,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class BaosongTaskServiceImpl extends ServiceImpl<BaosongTaskMapper, BaosongTask> implements IBaosongTaskService {
+
+    @Autowired
+    private IBaosongTaskAllocService baosongTaskAllocService;
+    @Autowired
+    private IBaosongTplService baosongTplService;
+
     @Override
     public void updateTaskSta(Integer sta,Integer taskId) {
         BaosongTask baosongTask = new BaosongTask();
@@ -22,4 +42,35 @@ public class BaosongTaskServiceImpl extends ServiceImpl<BaosongTaskMapper, Baoso
         baosongTask.setId(taskId);
         this.updateById(baosongTask);
     }
+
+    @Override
+    public List<BaosongTpl> findUserRightForTpl(Integer taskId) {
+        List<BaosongTpl> retTplList = new ArrayList<>();
+
+        try {
+            List<BaosongTaskAlloc> allocTplList = baosongTaskAllocService.lambdaQuery()
+                    .eq(BaosongTaskAlloc::getFillUser,  UserUtil.getUserId())
+                    .eq(BaosongTaskAlloc::getTaskid,taskId)
+                    .list();
+            Set<Integer> tplIdSet = new HashSet<>();
+            for (BaosongTaskAlloc alloc : allocTplList) {
+                Integer tplId = alloc.getTplid();
+                if (tplId != null) {
+                    tplIdSet.add(tplId);
+                }
+            }
+
+            if (!tplIdSet.isEmpty()) {
+                retTplList = baosongTplService.lambdaQuery()
+                        .in(BaosongTpl::getId, tplIdSet)
+                        .list();
+            }
+
+        } catch (Exception e) {
+            log.error("查询用户模板权限失败", e);
+        }
+
+        return retTplList;
+    }
+
 }