From 830b09bd7815d6880cc5a76cd28966ef61926737 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 7 Mar 2023 16:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E4=BB=B6=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xboe/module/course/api/CourseFileApi.java | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java
index fc2787c4..9b6bcefb 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java
@@ -174,13 +174,33 @@ public class CourseFileApi extends ApiBaseController {
         }
 
         //默认是查询自己的课件。
-        if (self == null) {
-            self = false;
-        }
-        if (self) {
-            filters.add(FieldFilters.eq("sysCreateAid", getCurrent().getAccountId()));
-        }
+//        if (self == null) {
+//            self = false;
+//        }
+//        if (self) {
+//            filters.add(FieldFilters.eq("sysCreateAid", getCurrent().getAccountId()));
+//        }
         //
+        //增加权限的过滤,只要看到自己或有权限的机构的
+        if(TempFilterConfig.Manager_CourseFile_ByOrgIds) {
+        	UserOrgIds userOrgIds=outSideDataService.getOrgIds();
+	        List<String> orgIds = userOrgIds.getIds();
+	        String aid=getCurrent().getAccountId();
+	        //如果是超级管理员，就不按机构过滤了
+	        boolean  isSystemAdmin=false;
+	        if(userOrgIds.getPermissions().containsKey(UserOrgIds.IsSystemAdminKey)) {
+	        	isSystemAdmin=userOrgIds.getPermissions().get(UserOrgIds.IsSystemAdminKey);
+	        }
+	        if(!isSystemAdmin) {
+	        	 if(!orgIds.isEmpty()){
+	 	        	//filters.add(FieldFilters.in("orgId", orgIds));
+	 	        	filters.add(FieldFilters.or(FieldFilters.eq("sysCreateAid", aid),FieldFilters.in("orgId", orgIds)));
+	 	        }else {
+	 	        	filters.add(FieldFilters.eq("sysCreateAid", aid));
+	 	        }
+	        }
+	       
+        }
         PageList<CourseFile> courseFilePageList = courseFileService.queryPage(pager.getPageIndex(), pager.getPageSize(), OrderCondition.desc("id"), filters);
         return success(courseFilePageList);
     }