门店分组

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

@@ -21,6 +21,7 @@ import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
 import com.gic.enterprise.api.dto.PowerStoreGroupDTO;
+import com.gic.enterprise.api.dto.StoreGroupDTO;
 import com.gic.enterprise.api.dto.StoreWidgetDTO;
 import com.gic.enterprise.api.dto.StoreWidgetRightDataDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -95,6 +96,7 @@ public class GicDepartmentController extends WebBaseController{
                 if(idList.contains(item.getStoreGroupId())) {
                     HaobanStoreGroupVO vo = EntityUtil.changeEntityByOrika(HaobanStoreGroupVO.class, item) ;
                     vo.setHasRight(true);
+                    this.addSubGroup(enterpriseId, vo.getStoreGroupId(), retList);
                     retList.add(vo) ;
                     String chain = item.getStoreGroupChain() ;
                     String[] arr = chain.split("_") ;
@@ -108,7 +110,11 @@ public class GicDepartmentController extends WebBaseController{
             }
             logger.info("有权限的列表={}",otherList);
             for(PowerStoreGroupDTO item : departmentList) {
-                if(otherList.contains(item.getStoreGroupId()) && !idList.contains(item.getStoreGroupId())) {
+                String groupId = item.getStoreGroupId() ;
+                if(idList.contains(groupId)) {
+                    continue ;
+                }
+                if(otherList.contains(groupId)) {
                     HaobanStoreGroupVO vo = EntityUtil.changeEntityByOrika(HaobanStoreGroupVO.class, item) ;
                     idList.add(vo.getStoreGroupId());
                     retList.add(vo) ;
@@ -122,7 +128,18 @@ public class GicDepartmentController extends WebBaseController{
             });
         }
 		return resultResponse(HaoBanErrCode.ERR_1,retList);
-
+	}
+	
+	
+	private void addSubGroup(String enterpriseId ,String parentGroupId , List<HaobanStoreGroupVO> retList) {
+	    List<StoreGroupDTO> list = this.storeGroupService.getStoreGroupList(enterpriseId, null, parentGroupId) ;
+	    if(CollectionUtils.isNotEmpty(list)) {
+	        List<HaobanStoreGroupVO> voList = EntityUtil.changeEntityListByOrika(HaobanStoreGroupVO.class, list) ;
+	        voList.forEach(dto->{
+	            dto.setHasRight(true);
+	        });
+	        retList.addAll(voList) ;
+	    }
 	}
 
 	@RequestMapping("gic-store-group-list")