diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
index 0635d1b9af..08cee985a4 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
@@ -31,8 +31,8 @@ public class BaseGoodsBrandRest {
     }
     @ApiOperation("查询所有的品牌")
     @PostMapping("/listAll")
-    public ResultBean<List<BaseBrandInfo>> listAll(@RequestBody OrgPathQuery query) {
-        return baseBrandInfoService.listAll(query);
+    public ResultBean<List<BaseBrandInfo>> listAll(@RequestParam("useOrgSid") String useOrgSid) {
+        return baseBrandInfoService.listAll(useOrgSid);
     }
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
index dcd6bb5b52..4f1793c353 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
@@ -31,8 +31,8 @@ public class BaseGoodsTypeRest {
     }
     @ApiOperation("查询所有的类别")
     @PostMapping("/listAll")
-    public ResultBean<List<BaseGoodsType>> listAll(@RequestBody OrgPathQuery query) {
-        return baseGoodsTypeService.listAll(query);
+    public ResultBean<List<BaseGoodsType>> listAll(@RequestParam("useOrgSid") String useOrgSid) {
+        return baseGoodsTypeService.listAll(useOrgSid);
     }
 
     @ApiOperation("根据数据权限查询类别")
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
index 44324b2dbf..ee383a9798 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
@@ -31,8 +31,8 @@ public class BaseGoodsUnitRest {
     }
     @ApiOperation("查询所有的类别")
     @PostMapping("/listAll")
-    public ResultBean<List<BaseGoodsUnit>> listAll(@RequestBody OrgPathQuery query) {
-        return baseGoodsUnitService.listAll(query);
+    public ResultBean<List<BaseGoodsUnit>> listAll(@RequestParam("useOrgSid") String useOrgSid) {
+        return baseGoodsUnitService.listAll(useOrgSid);
     }
 
     @ApiOperation("保存修改")
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
index b52f73ab75..93ad2a13ea 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
@@ -32,8 +32,8 @@ public class BaseManufacturerRest {
 
     @ApiOperation("查询所有的厂家")
     @PostMapping("/listAll")
-    public ResultBean<List<BaseManufacturer>> listAll(@RequestBody OrgPathQuery query) {
-        return baseManufacturerService.listAll(query);
+    public ResultBean<List<BaseManufacturer>> listAll(@RequestParam("useOrgSid") String useOrgSid) {
+        return baseManufacturerService.listAll(useOrgSid);
     }
 
     @ApiOperation("保存修改")
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
index 419bac1e0d..4df9ab5ea2 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
@@ -40,6 +40,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+
     public ResultBean<PagerVo<BaseBrandInfoVo>> listPage(PagerQuery<BaseBrandInfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         BaseBrandInfoQuery query = pq.getParams();
@@ -80,10 +81,10 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
             PagerVo<BaseBrandInfoVo> p = new PagerVo<>();
             return rb.success().setData(p);
         }
-        if(StringUtils.isNotBlank(query.getName())){
-            qw.like("b.brandName",query.getName());
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("b.brandName", query.getName());
         }
-        qw.ne("b.isDelete","1");
+        qw.ne("b.isDelete", "1");
         IPage<BaseBrandInfo> page = PagerUtil.queryToPage(pq);
         IPage<BaseBrandInfoVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<BaseBrandInfoVo> p = PagerUtil.pageToVo(pagging, null);
@@ -98,62 +99,13 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
 //        }
         return rb.success().setData(p);
     }
-    public ResultBean<List<BaseBrandInfo>> listAll(@RequestBody OrgPathQuery query) {
-    ResultBean rb = ResultBean.fireFail();
-        QueryWrapper<BaseBrandInfo> qw = new QueryWrapper<>();
-        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-        privilegeQuery.setOrgPath(query.getOrgPath());
-        privilegeQuery.setMenuUrl(query.getMenuUrl());
-        privilegeQuery.setUserSid(query.getUserSid());
-        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-            String orgSidPath = query.getOrgPath();
-            orgSidPath = orgSidPath + "/";
-            int i1 = orgSidPath.indexOf("/");
-            int i2 = orgSidPath.indexOf("/", i1 + 1);
-            int i3 = orgSidPath.indexOf("/", i2 + 1);
-            int i4 = orgSidPath.indexOf("/", i3 + 1);
-            String orgLevelKey = defaultIdReltBean.getData();
-            if ("1".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("s.orgSidPath", orgSidPath);
-            } else if ("2".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("s.orgSidPath", orgSidPath);
-            } else if ("3".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("s.orgSidPath", orgSidPath);
-            } else if ("4".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("s.orgSidPath", orgSidPath);
-            } else if ("5".equals(orgLevelKey)) {
-                qw.eq("b.createBySid", query.getUserSid());
-            } else {
-                return rb.success().setData(new ArrayList<>());
-            }
-        } else {
-            return rb.success().setData(new ArrayList<>());
-        }
-        qw.eq("b.isEnable",1);
-        qw.ne("b.isDelete",1);
-        List<BaseBrandInfo> pagging = baseMapper.selListAll(qw);
-//        String useOrgSid = "";
-//        String orgPath = query.getOrgPath();
-//        if (StringUtils.isNotBlank(orgPath)) {
-//            List<String> split = Arrays.asList(orgPath.split("/"));
-//            if (split.size() > 1) {
-//                //获取本级sid获取本级部门信息
-//                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-//                useOrgSid = sysOrganization1.getSid();
-//            } else {
-//                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-//                useOrgSid = sysOrganization.getSid();
-//            }
-//        }
-//    List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1).ne("isDelete","1").eq("useOrgSid",useOrgSid));
-    return rb.success().setData(pagging);
-}
+
+    public ResultBean<List<BaseBrandInfo>> listAll(String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable", 1).ne("isDelete", "1").eq("useOrgSid", useOrgSid));
+        return rb.success().setData(pagging);
+    }
+
     public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = "";
@@ -168,8 +120,8 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
 //                wmsGoodsBrand.setBigPic(path);
 //            }
             wmsGoodsBrand.setModifyTime(new Date());
-            BaseBrandInfo goods=baseMapper.checkForUpdate(dto.getBrandCode(),wmsGoodsBrand.getUseOrgSid(),sid);
-            if(null!=goods){
+            BaseBrandInfo goods = baseMapper.checkForUpdate(dto.getBrandCode(), wmsGoodsBrand.getUseOrgSid(), sid);
+            if (null != goods) {
                 return rb.setMsg("品牌代码不能重复");
             }
             baseMapper.updateById(wmsGoodsBrand);
@@ -205,8 +157,8 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
                     wmsGoodsBrand.setCreateOrgSid(createOrgSid);
                 }
             }
-            BaseBrandInfo goods=baseMapper.checkForInsert(dto.getBrandCode(),deptSid);
-            if(null!=goods){
+            BaseBrandInfo goods = baseMapper.checkForInsert(dto.getBrandCode(), deptSid);
+            if (null != goods) {
                 return rb.setMsg("品牌代码不能重复");
             }
 //            if (StringUtils.isNotBlank(dto.getBigPic())) {
@@ -239,7 +191,6 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
     }
 
 
-
     public ResultBean delete(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseBrandInfo wmsGoodsBrand = fetchBySid(sid);
@@ -248,10 +199,12 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
         }
         return rb.success().setMsg("成功");
     }
+
     public void delAll(String[] sids) {
         int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
     }
-    public ResultBean updateIsEnable(String sid,String isEnable) {
+
+    public ResultBean updateIsEnable(String sid, String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         BaseBrandInfo wmsGoodsBrand = fetchBySid(sid);
         if (null != wmsGoodsBrand) {
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
index a8f71313be..0dd7443612 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
@@ -21,6 +21,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -169,65 +170,12 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
         return rb.success().setData(p);
     }
 
-    public ResultBean<List<BaseGoodsType>> listAll(OrgPathQuery query) {
+    public ResultBean<List<BaseGoodsType>> listAll(String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();
-        QueryWrapper<BaseGoodsType> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getMenuUrl())) {
-            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-            privilegeQuery.setOrgPath(query.getOrgPath());
-            privilegeQuery.setMenuUrl(query.getMenuUrl());
-            privilegeQuery.setUserSid(query.getUserSid());
-            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-                String orgSidPath = query.getOrgPath();
-                orgSidPath = orgSidPath + "/";
-                int i1 = orgSidPath.indexOf("/");
-                int i2 = orgSidPath.indexOf("/", i1 + 1);
-                int i3 = orgSidPath.indexOf("/", i2 + 1);
-                int i4 = orgSidPath.indexOf("/", i3 + 1);
-                String orgLevelKey = defaultIdReltBean.getData();
-                if ("1".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i1);
-                    qw.like("u.orgSidPath", orgSidPath);
-                } else if ("2".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i2);
-                    qw.like("u.orgSidPath", orgSidPath);
-                } else if ("3".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i3);
-                    qw.like("u.orgSidPath", orgSidPath);
-                } else if ("4".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i4);
-                    qw.like("u.orgSidPath", orgSidPath);
-                } else if ("5".equals(orgLevelKey)) {
-                    qw.eq("p.createBySid", query.getUserSid());
-                } else {
-                    return rb.success().setData(new ArrayList<>());
-                }
-            } else {
-                return rb.success().setData(new ArrayList<>());
-            }
-        }
-        qw.eq("p.isEnable", 1);
-        qw.ne("p.isDelete", 1);
-        List<BaseGoodsType> pagging = baseMapper.selListAll(qw);
-//        String useOrgSid = "";
-//        String orgPath = query.getOrgPath();
-//        if (StringUtils.isNotBlank(orgPath)) {
-//            List<String> split = Arrays.asList(orgPath.split("/"));
-//            if (split.size() > 1) {
-//                //获取本级sid获取本级部门信息
-//                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-//                useOrgSid = sysOrganization1.getSid();
-//            } else {
-//                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-//                useOrgSid = sysOrganization.getSid();
-//            }
-//        }
-//        List<BaseGoodsType> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsType>().eq("isEnable",1)
-//                .ne("isDelete","1")
-//                .eq("useOrgSid",useOrgSid)
-//        );
+        List<BaseGoodsType> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsType>().eq("isEnable",1)
+                .ne("isDelete","1")
+                .eq("useOrgSid",useOrgSid)
+        );
         return rb.success().setData(pagging);
     }
 
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
index 764a8de26d..d4642bd1dd 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
@@ -21,6 +21,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -91,21 +92,8 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
         PagerVo<BaseGoodsUnitVo> p = PagerUtil.pageToVo(pagging, null);
         List<BaseGoodsUnitVo> records = pagging.getRecords();
         return rb.success().setData(p);
-    }    public ResultBean<List<BaseGoodsUnit>> listAll(OrgPathQuery query) {
+    }    public ResultBean<List<BaseGoodsUnit>> listAll(String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = "";
-        String orgPath = query.getOrgPath();
-        if (StringUtils.isNotBlank(orgPath)) {
-            List<String> split = Arrays.asList(orgPath.split("/"));
-            if (split.size() > 1) {
-                //获取本级sid获取本级部门信息
-                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-                useOrgSid = sysOrganization1.getSid();
-            } else {
-                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-                useOrgSid = sysOrganization.getSid();
-            }
-        }
         List<BaseGoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsUnit>().eq("isEnable",1)
                 .ne("isDelete","1")
                 .eq("useOrgSid",useOrgSid)
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
index 8533244534..8ba4e3bff3 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
@@ -21,6 +21,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -94,63 +95,12 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         List<BaseManufacturerVo> records = pagging.getRecords();
         return rb.success().setData(p);
     }
-    public ResultBean<List<BaseManufacturer>> listAll(OrgPathQuery query) {
+    public ResultBean<List<BaseManufacturer>> listAll(String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();
-        QueryWrapper<BaseManufacturer> qw = new QueryWrapper<>();
-        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-        privilegeQuery.setOrgPath(query.getOrgPath());
-        privilegeQuery.setMenuUrl(query.getMenuUrl());
-        privilegeQuery.setUserSid(query.getUserSid());
-        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-            String orgSidPath = query.getOrgPath();
-            orgSidPath = orgSidPath + "/";
-            int i1 = orgSidPath.indexOf("/");
-            int i2 = orgSidPath.indexOf("/", i1 + 1);
-            int i3 = orgSidPath.indexOf("/", i2 + 1);
-            int i4 = orgSidPath.indexOf("/", i3 + 1);
-            String orgLevelKey = defaultIdReltBean.getData();
-            if ("1".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("u.orgSidPath", orgSidPath);
-            } else if ("2".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("u.orgSidPath", orgSidPath);
-            } else if ("3".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("u.orgSidPath", orgSidPath);
-            } else if ("4".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("u.orgSidPath", orgSidPath);
-            } else if ("5".equals(orgLevelKey)) {
-                qw.eq("p.createBySid", query.getUserSid());
-            } else {
-                return rb.success().setData(new ArrayList<>());
-            }
-        } else {
-            return rb.success().setData(new ArrayList<>());
-        }
-        qw.eq("p.isEnable",1);
-        qw.ne("p.isDelete",1);
-        List<BaseManufacturer> pagging = baseMapper.selListAll(qw);
-//        String useOrgSid = "";
-//        String orgPath = query.getOrgPath();
-//        if (StringUtils.isNotBlank(orgPath)) {
-//            List<String> split = Arrays.asList(orgPath.split("/"));
-//            if (split.size() > 1) {
-//                //获取本级sid获取本级部门信息
-//                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-//                useOrgSid = sysOrganization1.getSid();
-//            } else {
-//                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-//                useOrgSid = sysOrganization.getSid();
-//            }
-//        }
-//        List<BaseManufacturer> pagging = baseMapper.selectList(new QueryWrapper<BaseManufacturer>().eq("isEnable",1)
-//                .ne("isDelete","1")
-//                .eq("useOrgSid",useOrgSid)
-//        );
+        List<BaseManufacturer> pagging = baseMapper.selectList(new QueryWrapper<BaseManufacturer>().eq("isEnable",1)
+                .ne("isDelete","1")
+                .eq("useOrgSid",useOrgSid)
+        );
         return rb.success().setData(pagging);
     }