diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
index 7fdf7a5e..e312a090 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
@@ -84,14 +84,14 @@ public class BmsSupplierController {
             param.setCode(param.getSupplierCode());
         }
 
-//        String userId = param.getUserId();
-//        if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){
-//            List<String> userIds = sysPostUserService.listByChildIds(userId);
-//            userIds.add(userId);
-//            param.setSelectUserIds(userIds);
-//        }else {
-//            param.setCurrUserId(userId);
-//        }
+        String userId = param.getUserId();
+        if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){
+            List<String> userIds = sysPostUserService.listByChildIds(userId);
+            userIds.add(userId);
+            param.setSelectUserIds(userIds);
+        }else {
+            param.setCurrUserId(userId);
+        }
 
         if(StringUtils.hasText(param.getRegion2Label())){
             LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -168,13 +168,13 @@ public class BmsSupplierController {
         List<BmsSupplier> list = bmsSupplierService.selectSupplierList(param);
         initSupplierList(list);
         initParentList(list);
-//        for (BmsSupplier supplier : list) {
-//            supplier.setMasterFlag(0);
-//            if(supplier.getUserId()!=null&&supplier.getUserId().equals(userId)){
-//                supplier.setMasterFlag(1);
-//                break;
-//            }
-//        }
+        for (BmsSupplier supplier : list) {
+            supplier.setMasterFlag(0);
+            if(supplier.getUserId()!=null&&supplier.getUserId().equals(userId)){
+                supplier.setMasterFlag(1);
+                break;
+            }
+        }
         return R.ok(list);
     }
 
@@ -266,11 +266,9 @@ public class BmsSupplierController {
             }else{
                 param.setSearchRegionSecond(Arrays.asList("#"));
             }
-        } 
+        }
 
         if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){
-            List<BmsSupplier> list = bmsSupplierService.selectSupplierList(param);
-            param.setSearchInIds(list.stream().map(a->a.getId()).collect(Collectors.toList()));
             PageUtil.setPageSize(param.getPageSize()+"");
             PageUtil.setPageNum(param.getPageNum()+"");
             return supplierMyController.getUnderlingAndMinePage(param);
diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java
index 38e2ea66..a7baf8b1 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java
@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -55,6 +56,77 @@ public class BmsSupplierMyController {
      */
     @GetMapping("/page")
     public R<PageVo<BmsSupplier>> getPage(BmsSupplier param){
+        if(StringUtils.hasText(param.getRegion2Label())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getPathNames,param.getRegion2Label());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setRegion2Ids(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setRegion2Ids(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegion2FirstName())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getName,param.getSearchRegion2FirstName());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setSearchRegion2First(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegion2First(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegion2SecondName())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getName,param.getSearchRegion2SecondName());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setSearchRegion2Second(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegion2Second(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegion2ThirdName())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getName,param.getSearchRegion2ThirdName());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setSearchRegion2Third(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegion2Third(Arrays.asList("#"));
+            }
+        }
+
+        if(StringUtils.hasText(param.getRegionLabel())){
+            LambdaQueryWrapper<BmsRegion> regionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            regionLambdaQueryWrapper.like(BmsRegion::getPathNames,param.getRegionLabel());
+            List<BmsRegion> regionList = bmsRegionService.list(regionLambdaQueryWrapper);
+            if(regionList.size()>0) {
+                param.setRegionIds(regionList.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setRegion2Ids(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegionFirstName())){
+            LambdaQueryWrapper<BmsRegion> regionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            regionLambdaQueryWrapper.like(BmsRegion::getName,param.getSearchRegionFirstName());
+            List<BmsRegion> regionList = bmsRegionService.list(regionLambdaQueryWrapper);
+            if(regionList.size()>0) {
+                param.setSearchRegionFirst(regionList.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegionFirst(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegionSecondName())){
+            LambdaQueryWrapper<BmsRegion> regionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            regionLambdaQueryWrapper.like(BmsRegion::getName,param.getSearchRegionSecondName());
+            List<BmsRegion> regionList = bmsRegionService.list(regionLambdaQueryWrapper);
+            if(regionList.size()>0) {
+                param.setSearchRegionSecond(regionList.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegionSecond(Arrays.asList("#"));
+            }
+        }
         PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
         initSupplierList(pageVo.getList());
         return R.ok(pageVo);
@@ -67,6 +139,77 @@ public class BmsSupplierMyController {
      */
     @GetMapping("/underlingPage")
     public R<PageVo<BmsSupplier>> getUnderlingPage(BmsSupplier param){
+        if(StringUtils.hasText(param.getRegion2Label())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getPathNames,param.getRegion2Label());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setRegion2Ids(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setRegion2Ids(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegion2FirstName())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getName,param.getSearchRegion2FirstName());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setSearchRegion2First(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegion2First(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegion2SecondName())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getName,param.getSearchRegion2SecondName());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setSearchRegion2Second(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegion2Second(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegion2ThirdName())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getName,param.getSearchRegion2ThirdName());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setSearchRegion2Third(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegion2Third(Arrays.asList("#"));
+            }
+        }
+
+        if(StringUtils.hasText(param.getRegionLabel())){
+            LambdaQueryWrapper<BmsRegion> regionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            regionLambdaQueryWrapper.like(BmsRegion::getPathNames,param.getRegionLabel());
+            List<BmsRegion> regionList = bmsRegionService.list(regionLambdaQueryWrapper);
+            if(regionList.size()>0) {
+                param.setRegionIds(regionList.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setRegion2Ids(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegionFirstName())){
+            LambdaQueryWrapper<BmsRegion> regionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            regionLambdaQueryWrapper.like(BmsRegion::getName,param.getSearchRegionFirstName());
+            List<BmsRegion> regionList = bmsRegionService.list(regionLambdaQueryWrapper);
+            if(regionList.size()>0) {
+                param.setSearchRegionFirst(regionList.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegionFirst(Arrays.asList("#"));
+            }
+        }
+        if(StringUtils.hasText(param.getSearchRegionSecondName())){
+            LambdaQueryWrapper<BmsRegion> regionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            regionLambdaQueryWrapper.like(BmsRegion::getName,param.getSearchRegionSecondName());
+            List<BmsRegion> regionList = bmsRegionService.list(regionLambdaQueryWrapper);
+            if(regionList.size()>0) {
+                param.setSearchRegionSecond(regionList.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setSearchRegionSecond(Arrays.asList("#"));
+            }
+        }
         List<String> childIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId());
         param.setSelectUserIds(childIds);
         param.setSelectUserIdsFlag(true);
diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
index df236855..8dfb3454 100644
--- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
@@ -72,9 +72,6 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
         lqw.select("distinct his_user_supplier.supplier_id");
         lqw.lambda().in(HisUserSupplier::getUserId,userIds)
                 .ne(HisUserSupplier::getSupplierId,0);
-        if(CollectionUtil.isNotEmpty(param.getSearchInIds())){
-            lqw.lambda().in(HisUserSupplier::getSupplierId,param.getSearchInIds());
-        }
         if(usePage){
             PageUtil.startPage();
         }
@@ -84,18 +81,25 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
     @Override
     public List<BmsSupplier> selectListSupplier(BmsSupplier param) {
         List<HisUserSupplier> hisUserSuppliers = selectHisSupplier(param,false);
-        List<Long> supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
-        List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
-        return supplierList;
+        List<String> supplierIds = hisUserSuppliers.stream().map(a->a.getSupplierId().toString()).collect(Collectors.toList());
+        if(supplierIds.size()>0) {
+            param.setSearchInIds(supplierIds);
+            List<BmsSupplier> supplierList = bmsSupplierService.selectSupplierList(param);
+            return supplierList;
+        }else{
+            return new ArrayList<>();
+        }
     }
 
     @Override
     public PageVo<BmsSupplier> selectPageSupplier(BmsSupplier param) {
         List<HisUserSupplier> hisUserSuppliers = selectHisSupplier(param,true);
-        List<Long> supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
+        List<String> supplierIds = hisUserSuppliers.stream().map(a->a.getSupplierId().toString()).collect(Collectors.toList());
         if(supplierIds.size()>0) {
-            List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
-            return R.buildPageHelperList(hisUserSuppliers,supplierList);
+            param.setSearchInIds(supplierIds);
+            PageHelper.startPage(param.getPageNum(),param.getPageSize());
+            List<BmsSupplier> supplierList = bmsSupplierService.selectSupplierList(param);
+            return R.buildPageHelperList(supplierList);
         }else{
             return R.buildPageHelperList(new ArrayList<>());
         }
diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml
index 5f7093b0..f253b34c 100644
--- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml
+++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml
@@ -105,6 +105,12 @@
             <if test="query.searchUserCode!=null and query.searchUserCode != ''">
                 and (`bms_supplier`.`user_code` LIKE CONCAT('%',#{query.searchUserCode},'%') or `bms_supplier`.`other_user_codes` LIKE CONCAT('%',#{query.searchUserCode},'%') )
             </if>
+            <if test="query.searchInIds!=null and query.searchInIds.size > 0">
+                and bms_supplier.id in
+                <foreach collection="query.searchInIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+            </if>
             <if test="query.regionIds!=null and query.regionIds.size > 0">
                 and bms_supplier.region_last in
                 <foreach collection="query.regionIds" item ="selectId" index="i" open="(" close=")" separator=",">