分组

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

@@ -2,8 +2,10 @@ package com.gic.haoban.manage.web.controller;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -26,11 +28,13 @@ import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.enterprise.api.service.StoreWidgetService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.StoreRangeInfoDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.HaobanStoreGroupVO;
 import com.gic.haoban.manage.web.vo.StoreGroupVo;
 
 
@@ -81,29 +85,40 @@ public class GicDepartmentController extends WebBaseController{
                 }
             }
         }
+        List<HaobanStoreGroupVO> retList = new ArrayList<>();
         List<PowerStoreGroupDTO>  departmentList = storeGroupService.getStoreGroupList(enterpriseId, keyWord);
         if(null != list) {
-            List<PowerStoreGroupDTO> retList = new ArrayList<>();
             List<String> idList = list.stream().map(dto->dto.getId()).collect(Collectors.toList()) ;
+            Set<String> otherList = new HashSet<>();
             for(PowerStoreGroupDTO item : departmentList) {
-                if("0".equals(item.getParentGroupId())) {
-                    retList.add(item) ;
-                    continue ;
-                }
                 if(idList.contains(item.getStoreGroupId())) {
-                    retList.add(item) ;
-                }else {
-                    for(String id : idList) {
-                        if(item.getStoreGroupChain().contains(id)) {
-                            retList.add(item) ;
-                            break ;
+                    HaobanStoreGroupVO vo = EntityUtil.changeEntityByOrika(HaobanStoreGroupVO.class, item) ;
+                    vo.setHasRight(true);
+                    retList.add(vo) ;
+                    String chain = item.getStoreGroupChain() ;
+                    String[] arr = chain.split("_") ;
+                    for(int i=0;i<arr.length;i++) {
+                        String s = arr[i] ;
+                        if(StringUtils.isNotBlank(s) && !s.equals(item.getStoreGroupId())) {
+                            otherList.add(s) ;
                         }
                     }
                 }
             }
+            for(PowerStoreGroupDTO item : departmentList) {
+                if(otherList.contains(item.getStoreGroupId())) {
+                    HaobanStoreGroupVO vo = EntityUtil.changeEntityByOrika(HaobanStoreGroupVO.class, item) ;
+                    retList.add(vo) ;
+                }
+            }
             return resultResponse(HaoBanErrCode.ERR_1,retList) ;
+        }else {
+            retList = EntityUtil.changeEntityListByOrika(HaobanStoreGroupVO.class, departmentList) ;
+            retList.forEach(item->{;
+                item.setHasRight(true);
+            });
         }
-		return resultResponse(HaoBanErrCode.ERR_1,departmentList);
+		return resultResponse(HaoBanErrCode.ERR_1,retList);
 
 	}