授权小程序列表

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -21,7 +21,7 @@ public interface WxEnterpriseRelatedApiService {
 	
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseIdList(List<String> wxEnterpriseIdList);
 	
-	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber);
+	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber ,boolean filterFlag);
 
 	String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -114,7 +115,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 
     @Override
     public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId) {
-        return this.listEnterpriseByWxEnterpriseId(wxEnterpriseId, null) ;
+        return this.listEnterpriseByWxEnterpriseId(wxEnterpriseId, null,false) ;
     }
     
     @Override
@@ -142,7 +143,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     }
     
     @Override
-    public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId, String phoneNumber) {
+    public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId, String phoneNumber,boolean filterFlag) {
         logger.info("listEnterpriseByWxEnterpriseId,wxeid={},phone={}",wxEnterpriseId,phoneNumber);
         List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
         List<EnterpriseDetailDTO> list = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
@@ -152,7 +153,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         List<String> enterpriseIds = list.stream().map(s -> s.getEnterpriseId()).collect(Collectors.toList());
         List<EnterpriseDTO> enterpriseList = enterpriseService.listEnterpriseByIds(enterpriseIds);
         Map<String, EnterpriseDTO> map = com.gic.commons.util.CollectionUtil.toMap(enterpriseList, "enterpriseId");
-        for (EnterpriseDetailDTO dto : list) {
+        Iterator<EnterpriseDetailDTO> it = list.iterator() ;
+        while(it.hasNext()) {
+            EnterpriseDetailDTO dto = it.next() ;
             EnterpriseDTO enterpriseDTO = map.get(dto.getEnterpriseId());
             if (enterpriseDTO != null) {
                 dto.setEnterpriseName(enterpriseDTO.getEnterpriseName());
@@ -163,6 +166,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
                     com.gic.api.base.commons.ServiceResponse<Boolean> resp = this.rightService.hasHaobanAcl(enterpriseDTO.getEnterpriseId(), phoneNumber) ;
                     if(!resp.getResult()) {
                         dto.setAclFlag(0);
+                        if(filterFlag) {
+                            it.remove(); 
+                        }
                     }
                 }
             }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -122,7 +122,7 @@ public class LoginController extends WebBaseController {
             logger.info("未配置手机号,staffId ={}", loginStaff.getStaffId());
             return this.fail("登录失败,未配置手机号");
         }
-        List<EnterpriseDetailDTO> list = this.wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,loginPhoneNumber);
+        List<EnterpriseDetailDTO> list = this.wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,loginPhoneNumber,true);
         if (CollectionUtils.isEmpty(list)) {
             logger.info("企微下无管理GIC商户");
             return this.fail("企微下无管理GIC商户");

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -106,7 +106,8 @@ public class WxEnterpriseController extends WebBaseController {
     public HaobanResponse wxEnterpriseList() {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
-        List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
+        String phoneNumber = login.getPhoneNumber() ;
+        List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,phoneNumber,true);
         List<EnterpriseDetailVO> detailVOS = EntityUtil.changeEntityListByOrika(EnterpriseDetailVO.class, list);
         if (CollectionUtil.isNotEmpty(detailVOS)) {
             List<String> enterpriseIds = detailVOS.stream().map(s -> s.getEnterpriseId()).collect(Collectors.toList());
@@ -135,16 +136,7 @@ public class WxEnterpriseController extends WebBaseController {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         String phoneNumber = login.getPhoneNumber() ;
-        List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,phoneNumber);
-        if(filteRight==1) {
-            Iterator<EnterpriseDetailDTO> it = list.iterator() ;
-            while(it.hasNext()) {
-                EnterpriseDetailDTO item = it.next() ;
-                if(item.getAclFlag()==0) {
-                    it.remove(); 
-                }
-            }
-        }
+        List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,phoneNumber,filteRight==1);
         String staffId = login.getStaffId() ;
         StaffDTO dto =  this.staffApiService.selectById(staffId) ;
         String eid = dto.getDefaultGicEid() ;