Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -75,7 +75,7 @@ public class AdminWebsitLogic {
 
         List<AdminWebsitTree> parentList = trees.stream().filter(x -> x.getParentId() == 0).collect(Collectors.toList());
         for(AdminWebsitTree adminWebsit:parentList){
-            adminWebsit.setChildren(this.treeModule(trees,adminWebsit.getWebsitId(),adminWebsit.getCorpId()));
+            adminWebsit.setChildren(this.treeModule(trees,adminWebsit.getWebsitId(),adminWebsit.getCompanyWechatId()));
         }
         return parentList;
     }
@@ -199,18 +199,18 @@ public class AdminWebsitLogic {
      * @param parentId
      * @return
      */
-    private List<AdminWebsitTree> treeModule(List<AdminWebsitTree> list, String parentId,String corpId){
+    private List<AdminWebsitTree> treeModule(List<AdminWebsitTree> list, String parentId,String companyId){
         //最父级资源树
         if(parentId == null || parentId.equals("0")) {
             return null;
         }
         List<AdminWebsitTree> collect = list.stream()
-                .filter(e -> e.getParentId().equals(parentId) && e.getCorpId().equals(corpId)).collect(Collectors.toList());
+                .filter(e -> e.getParentId().equals(parentId) && e.getCompanyWechatId().equals(companyId)).collect(Collectors.toList());
         if(collect.size() == 0){
             return null;
         }
         for(AdminWebsitTree bean : collect){
-            bean.setChildren(this.treeModule(list, bean.getWebsitId(),bean.getCorpId()));
+            bean.setChildren(this.treeModule(list, bean.getWebsitId(),bean.getCompanyWechatId()));
         }
         return collect;
     }

src/main/java/com/gree/mall/manager/logic/admin/ew/EnterpriseWechatWorkerLogic.java

@@ -53,8 +53,8 @@ public class EnterpriseWechatWorkerLogic {
     CommonLogic commonLogic;
     @Autowired
     EnterpriseWechatWorkerLogicMapper enterpriseWechatWorkerLogicMapper;
-    @Autowired
-    AdminWebsitService adminWebsitService;
+//    @Autowired
+//    AdminWebsitService adminWebsitService;
 
     /**
      * 企业成员列表
@@ -69,7 +69,7 @@ public class EnterpriseWechatWorkerLogic {
             list.addAll(adminWebsitLogic.queryAllChild(list, websitId));
             ids.add(websitId);
 
-            corpId = adminWebsitLogic.detail(adminWebsitId).getCorpId();
+//            corpId = adminWebsitLogic.detail(adminWebsitId).getCorpId();
         }
         ids.addAll(list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList()));
 
@@ -166,7 +166,7 @@ public class EnterpriseWechatWorkerLogic {
 //        if(wxCpUser != null){
 //            enterpriseWechatWorker.setQrCode(wxCpUser.getQrCode());
 //        }
-        enterpriseWechatWorker.setCorpId(adminWebsit.getCorpId());
+//        enterpriseWechatWorker.setCorpId(adminWebsit.getCorpId());
         enterpriseWechatWorker.setCreateTime(new Date());
         enterpriseWechatWorker.insert();