整理数据权限

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.qmth.boot.core.enums.Platform;
-import com.qmth.boot.tools.signature.SignatureType;
-import com.qmth.teachcloud.common.SignatureEntityTest;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.auth.ExpireTimeBean;
 import com.qmth.teachcloud.common.bean.dto.MenuDto;
@@ -113,7 +111,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         LinkedMultiValueMap<Long, MenuDto> linkedMultiValueMap = new LinkedMultiValueMap<>();
         List<MenuPrivilegeDto> menuPrivilegeDtoList = new ArrayList<>();
         for (MenuDto m : menuDtoList) {
-            if (Objects.isNull(m.getParentId()) || m.getType() == PrivilegeEnum.MENU) {
+            if (Objects.isNull(m.getParentId()) || m.getType() == PrivilegeEnum.MENU || m.getType() == PrivilegeEnum.TAB) {
                 menuPrivilegeDtoList.add(gson.fromJson(gson.toJson(m), MenuPrivilegeDto.class));
             } else {
                 if (!linkedMultiValueMap.containsKey(m.getParentId())) {
@@ -127,9 +125,14 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         }
         for (MenuPrivilegeDto m : menuPrivilegeDtoList) {
             List<MenuDto> menuDtos = linkedMultiValueMap.get(m.getId());
-            List<MenuDto> urls = null, buttons = null, links = null, lists = null, conditions = null;
+            List<MenuDto> urls = null, tabs = null, buttons = null, links = null, lists = null, conditions = null;
             if (Objects.nonNull(menuDtos)) {
                 for (MenuDto menuDto : menuDtos) {
+//                    if (menuDto.getType() == PrivilegeEnum.TAB) {
+//                        tabs = Objects.isNull(buttons) ? new ArrayList<>() : tabs;
+//                        tabs.add(gson.fromJson(gson.toJson(menuDto), MenuPrivilegeDto.class));
+//                        m.setTabs(buttons);
+//                    } else
                     if (menuDto.getType() == PrivilegeEnum.BUTTON) {
                         buttons = Objects.isNull(buttons) ? new ArrayList<>() : buttons;
                         buttons.add(gson.fromJson(gson.toJson(menuDto), MenuPrivilegeDto.class));
@@ -247,8 +250,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
                 int count = Objects.nonNull(sysRoleList) && sysRoleList.size() > 0 ? (int) sysRoleList.stream().filter(s -> Objects.equals(s.getName(), RoleTypeEnum.ADMIN.getDesc())).count() : 0;
                 QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
                 if (count > 0) {//超级系统管理员
-                    Long schoolId = Long.parseLong(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString());
-                    sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getSchoolId, schoolId)
+//                    Long schoolId = Long.parseLong(ServletUtil.getRequestSchoolByNotVaild().toString());
+                    sysPrivilegeQueryWrapper.lambda()
+//                            .eq(SysPrivilege::getSchoolId, schoolId)
                             .eq(SysPrivilege::getType, PrivilegeEnum.URL)
                             .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
                     List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);