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 4bbc7dcc..8eb76b9b 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
@@ -105,7 +105,7 @@ public class BmsSupplierController {
     public R<PageVo<BmsSupplier>> getPage(@RequestBody BmsSupplier param){
         if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){
             String userId = AuthContextUtils.getSysUserId();
-            hisUserSupplierService.initByUserId(userId,false);
+            hisUserSupplierService.initByUserId(userId,false,false);
             //初始化
             List<String> userIds = sysPostUserService.listByChildIds(userId);
             userIds.add(userId);
diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java
index 8abc2d0d..364df836 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java
@@ -68,7 +68,7 @@ public class BmsSupplierVisitAddressController {
     @PostMapping("/getPageForVisit")
     public R<PageVo<HisUserSupplierAddressVo>> getPageForVisit(@Valid @RequestBody BmsSupplierVisitSo param){
         String userId = AuthContextUtils.getSysUserId();
-        hisUserSupplierService.initByUserId(userId,false);
+        hisUserSupplierService.initByUserId(userId,false,true);
         HisUserSupplier userSupplier = new HisUserSupplier();
         //userSupplier.setUserId(userId);
         userSupplier.setSupplierName(param.getSupplierName());
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 940445e6..46e82300 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
@@ -43,8 +43,8 @@ public class BmsSupplierMyController {
 
     private BmsRegionService bmsRegionService;
     private BmsRegion2Service bmsRegion2Service;
-    private final BmsSupplierService bmsSupplierService;
-    private final HisUserSupplierService hisUserSupplierService;
+    private BmsSupplierService bmsSupplierService;
+    private HisUserSupplierService hisUserSupplierService;
     private SysPostUserService postUserService;
     private SysUserService sysUserService;
 
@@ -140,9 +140,10 @@ public class BmsSupplierMyController {
         List<String> userIds = sysUserService.list().stream().map(a->a.getId()).collect(Collectors.toList());
         param.setSelectUserIds(userIds);
         param.setSelectUserIdsFlag(true);
-        List<HisUserSupplier> list = hisUserSupplierService.selectSupplier(param,true);
-        List<BmsSupplier> supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList());
-        return R.byPageHelperList(list,supplierList);
+//        List<HisUserSupplier> list = hisUserSupplierService.selectSupplier(param,true);
+        PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
+        initSupplierList(pageVo.getList());
+        return R.ok(pageVo);
     }
 }
 
diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java
index 0bc9b668..350dfdff 100644
--- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java
@@ -39,7 +39,7 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
     private SysUserService sysUserService;
     private BmsChannelPointMapper bmsChannelPointMapper;
     private BmsFactoryService bmsFactoryService;
-    private BmsSupplierApplicationService bmsSupplierApplicationService;
+//    private BmsSupplierApplicationService bmsSupplierApplicationService;
 
     @Override
     public boolean saveBmsRegion(BmsRegion param){
diff --git a/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java b/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java
index ca206934..43c3d2ab 100644
--- a/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java
+++ b/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java
@@ -21,7 +21,7 @@ public interface HisUserSupplierService extends IService<HisUserSupplier> {
     PageVo<BmsSupplier> selectPageSupplier(BmsSupplier param);
 
 
-    boolean initByUserId(String userId,boolean hasCheck);
+    boolean initByUserId(String userId,boolean hasCheck,boolean nextChilds);
 
     /**
      * 初始化
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 45da1c1d..64f81cfa 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
@@ -52,11 +52,11 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
         List<String> userIds = param.getSelectUserIds();
         if(param.getSelectUserIdsFlag()!=null&&param.getSelectUserIdsFlag()){
             for (String userId : param.getSelectUserIds()) {
-                this.initByUserId(userId,false);
+                this.initByUserId(userId,false,false);
             }
         }else {
             String userId = AuthContextUtils.getSysUserId();
-            this.initByUserId(userId,false);
+            this.initByUserId(userId,false,false);
             userIds = Arrays.asList(userId);
         }
         if(CollectionUtil.isEmpty(userIds)){
@@ -85,8 +85,13 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
     public PageVo<BmsSupplier> selectPageSupplier(BmsSupplier param) {
         List<HisUserSupplier> hisUserSuppliers = selectHisSupplier(param,true);
         List<Long> supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
-        List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
-        return R.buildPageHelperList(supplierList);
+        if(supplierIds.size()>0) {
+            List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
+            return R.buildPageHelperList(supplierList);
+        }else{
+            return R.buildPageHelperList(new ArrayList<>());
+        }
+
     }
 
     @Override
@@ -100,9 +105,17 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
         return false;
     }
 
+
     @Override
-    public boolean initByUserId(String userId, boolean hasCheck) {
-        return initByUserId(userId, hasCheck,null);
+    public boolean initByUserId(String userId, boolean hasCheck, boolean nextChilds) {
+        List<String> existUserIds = new ArrayList<>();
+        if(nextChilds) {
+            List<String> childUserList = sysPostUserService.listByChildIds(userId);
+            for (String childUserId : childUserList) {
+                this.initByUserId(childUserId, false, existUserIds);
+            }
+        }
+        return initByUserId(userId, hasCheck,existUserIds);
     }
 
     @Override
@@ -116,12 +129,9 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
             }else {
                 existUserIds.add(userId);
             }
-            existUserIds.add(userId);
+//            existUserIds.add(userId);
             boolean checkInit = this.checkInit(userId);
-            List<String> childUserList = sysPostUserService.listByChildIds(userId);
-            for (String childUserId : childUserList) {
-                this.initByUserId(childUserId,false,existUserIds);
-            }
+
             if(checkInit){
                 return true;
             }