修改bug

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

@@ -6,10 +6,7 @@ import jakarta.servlet.http.HttpServletResponse;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-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.entity.BaosongTplItem;
+import org.jeecg.modules.stm.baosong.entity.*;
 import org.jeecg.modules.stm.baosong.service.IBaosongTaskAllocService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -270,7 +267,5 @@ public class BaosongTaskAllocController extends JeecgController<BaosongTaskAlloc
 		if(rootItemList.size()>0) {
 			list.addAll(0,rootItemList);
 		}
-
 	}
-
 }

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

@@ -248,20 +248,17 @@ public class BaosongTaskRecordController extends JeecgController<BaosongTaskReco
 		return Result.OK(list);
 	}
 
-	  
 	@GetMapping(value = "/findFilledlist")
 	public Result<List<BaosongQuery>> findFilledlist(BaosongQuery baosongQuery,
-													 HttpServletRequest req) {
+												 HttpServletRequest req) {
 		try {
-			System.out.println(baosongQuery.getTp());
 			List<BaosongQuery> list = baosongTaskRecordService.findTaskRecords(baosongQuery);
 			return Result.OK(list);
 		} catch (Exception e) {
 
 		}
-
 		return null;
-
 	}
 
+
 }

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

@@ -11,6 +11,9 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.stm.baosong.entity.BaosongQuery;
+import org.jeecg.modules.stm.baosong.entity.BaosongTaskAlloc;
+import org.jeecg.modules.stm.baosong.service.IBaosongTaskAllocService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -48,6 +51,8 @@ public class BaosongTplController extends JeecgController<BaosongTpl, IBaosongTp
 	private IBaosongTplService baosongTplService;
 	@Autowired
 	private IBaosongTplItemService baosongTplItemService;
+	@Autowired
+	private IBaosongTaskAllocService baosongTaskAllocService;
 
 	@Value(value = "${jeecg.path.upload}")
 	private String uploadpath;
@@ -283,4 +288,35 @@ public class BaosongTplController extends JeecgController<BaosongTpl, IBaosongTp
 		sb.append(uploadpath).append("/baosong/").append("银行业保险业信息科技非现场监管报表填报指南（2024版）.pdf");
 		return sb.toString();
 	}
+
+	@GetMapping(value = "/findUserRightForTpl")
+	public Result<List<BaosongTpl>> findUserRightForTpl(HttpServletRequest req) {
+		List<BaosongTpl> retTplList = new ArrayList<>();
+
+		try {
+			String userId = UserUtil.getUserId();
+			List<BaosongTaskAlloc> allocTplList = baosongTaskAllocService.lambdaQuery()
+					.eq(BaosongTaskAlloc::getFillUser, userId)
+					.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();
+			}
+
+			return Result.OK(retTplList);
+
+		} catch (Exception e) {
+			log.error("查询用户模板权限失败", e);
+			return Result.error("查询失败，请稍后重试");
+		}
+	}
  }

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

@@ -67,7 +67,6 @@ public class BaosongTaskAlloc implements Serializable {
 
 
     /**创建人*/
-    
     private java.lang.String createBy;
 
     @TableField(exist = false)