lyhzzz 2 هفته پیش
والد
کامیت
db01db2891

+ 2 - 0
src/main/java/com/fdkankan/fusion/entity/TmProject.java

@@ -205,6 +205,8 @@ public class TmProject implements Serializable {
     @TableField(exist = false)
     private List<Integer> fusionIdList;
 
+    @TableField(exist = false)
+    private Integer isAuth;
 
     public String getStatusDesc() {
         if(status !=null){

+ 12 - 0
src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -84,6 +84,7 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
         //教学场景
         List<String> deptIds = new ArrayList<>();
         List<String> projectIds = new ArrayList<>();
+        HashMap<Integer,SceneDeptShare> shareHashMap = new HashMap<>();
 
         String share = SaHolder.getRequest().getHeader("sharePassword");
         if(StringUtils.isNotBlank(share) ){ //分享请求头
@@ -97,6 +98,8 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
             if(tmProject.getSearchType() == 1){  //下级共享给上级场景
                 List<SceneDeptShare> caseIds =  sceneDeptShareService.getCaseIdsListByDeptId(deptId);
                 projectIds = this.getIdsByCaseIds(caseIds.stream().map(SceneDeptShare::getCaseId).collect(Collectors.toList()));
+                caseIds.forEach(e -> shareHashMap.put(e.getCaseId(),e));
+
             }
             if(tmProject.getSearchType() == 2){  //当前组织及下级组织的数据
                 List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
@@ -197,6 +200,15 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
                     record.setCover(caseSettings1.getCover());
                 }
             }
+
+            if(tmProject.getSearchType() == 1){
+                SceneDeptShare sceneDeptShare = shareHashMap.get(record.getCaseId());
+                if(sceneDeptShare != null){
+                    record.setIsAuth(sceneDeptShare.getIsAuth());
+                }
+            }else {
+                record.setIsAuth(2);
+            }
         }
         return PageInfo.PageInfo(page);
     }