接口权限工具类修改

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/util/RoleDataUtils.java

@@ -1,9 +1,11 @@
 package org.jeecg.modules.util;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.common.system.util.JeecgDataAutorUtils;
 import org.jeecg.common.util.StringUtils;
 import org.jeecg.modules.hlgcompany.entity.HlgCompany;
 import org.jeecg.modules.hlgcompany.service.IHlgCompanyService;
+import org.jeecg.modules.system.entity.SysPermissionDataRule;
 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -56,7 +58,13 @@ public class RoleDataUtils {
      */
     public static List<String> findCompanyCodeList(String userName, String routeUrl, String orgCode) {
         List<String> codeList = new ArrayList<>();
-        String ruleValue = getRuleValue(userName, routeUrl);
+        String ruleValue = "";
+        //获取请求数据规则
+        List<SysPermissionDataRule> list = JeecgDataAutorUtils.loadDataSearchConditon();
+        if (list != null && list.size() > 0) {
+            SysPermissionDataRule sysPermissionDataRule = list.get(0);
+            ruleValue = sysPermissionDataRule.getRuleValue();
+        }
         QueryWrapper<HlgCompany> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(ruleValue)) {
             if (ruleValue.contains("=")) {