Merge branch 'zcwy-0613-wjw' into dev0525

This commit is contained in:
xiaozhequ
2024-06-18 15:49:38 +08:00

View File

@@ -129,12 +129,12 @@ public class CourseManageApi extends ApiBaseController{
List<String> orgIds = userOrgIds.getIds(); List<String> orgIds = userOrgIds.getIds();
// if(userOrgIds.getPermissions().containsKey(UserOrgIds.IsSystemAdminKey)){ if(userOrgIds.getPermissions().containsKey(UserOrgIds.IsSystemAdminKey)){
// dto.setIsSystemAdmin(userOrgIds.getPermissions().get(UserOrgIds.IsSystemAdminKey)); dto.setIsSystemAdmin(userOrgIds.getPermissions().get(UserOrgIds.IsSystemAdminKey));
// }else { }else {
// dto.setIsSystemAdmin(false); dto.setIsSystemAdmin(false);
// } }
dto.setIsSystemAdmin(false); // dto.setIsSystemAdmin(false);
String ids=""; String ids="";
if(userOrgIds.getIds()!=null && !userOrgIds.getIds().isEmpty()) if(userOrgIds.getIds()!=null && !userOrgIds.getIds().isEmpty())
{ {