|
|
@@ -3,6 +3,7 @@ package com.sckw.system.service;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import com.mysql.cj.x.protobuf.MysqlxDatatypes;
|
|
|
import com.sckw.contract.api.RemoteContractService;
|
|
|
import com.sckw.core.exception.SystemException;
|
|
|
import com.sckw.core.model.constant.Global;
|
|
|
@@ -339,7 +340,11 @@ public class KwsMenuService {
|
|
|
if (Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode()) && Objects.equals(LoginUserHolder.getIsMain(), Global.YES)) {
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+ //pc端和app权限不做过滤,
|
|
|
+ // 根据用户id查询角色id
|
|
|
+ if (Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.COMPANY.getCode()) && org.apache.commons.lang3.StringUtils.equals(clientType, String.valueOf(Global.NUMERICAL_THREE))) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
//特殊处理,后面会做菜单关联
|
|
|
findMenuTreePojo.setClientType(clientType.equals(String.valueOf(Global.NUMERICAL_THREE)) ? Global.NUMERICAL_TWO : Integer.parseInt(clientType));
|
|
|
if (Objects.equals(LoginUserHolder.getIsMain(), Global.YES)) {
|