Merge remote-tracking branch 'origin/developer' into developer

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

@@ -15,7 +15,7 @@ public interface DepartmentApiService {
 	 * @param parentId
 	 * @return
 	 */
-	List<DepartmentDTO> listByDepartmentIds(List<String> departmentIds,int storeFlag);
+	List<DepartmentDTO> listByDepartmentIds(List<String> departmentIds,Integer storeFlag);
 	/**
 	 * 查门店列表
 	 * @param relatedIds
@@ -171,4 +171,7 @@ public interface DepartmentApiService {
 	 */
 	Integer totalStoreCountByEnterpriseId(String wxEnterpriseId);
 	
+	
+	List<DepartmentDTO> listSonByDepartmentIds(List<String> departmentIdSet, String wxEnterpriseId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -32,7 +32,7 @@ public interface DepartmentMapper {
 
 	List<TabHaobanDepartment> getByWxId(@Param("wxDepartmentId")String wxDepartmentId, @Param("wxEnterpriseId") String wxEnterpriseId);
 	
-	List<TabHaobanDepartment> listByDepartmentIds(@Param("departmentIds")List<String> departmentIds,@Param("storeFlag")int storeFlag);
+	List<TabHaobanDepartment> listByDepartmentIds(@Param("departmentIds")List<String> departmentIds,@Param("storeFlag")Integer storeFlag);
 
 	List<TabHaobanDepartment> listByRelatedIds(@Param("relatedIds")List<String> relatedIds);
 	

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

 package com.gic.haoban.manage.service.service.out.impl;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -370,7 +373,7 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 
 	@Override
 	public List<DepartmentDTO> listByDepartmentIds(List<String> departmentIds,
-			int storeFlag) {
+			Integer storeFlag) {
 		List<TabHaobanDepartment> list= departmentMapper.listByDepartmentIds(departmentIds, storeFlag);
 		if(list==null){
 			return new ArrayList<DepartmentDTO>();
@@ -758,4 +761,26 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 	public Integer totalStoreCountByEnterpriseId(String wxEnterpriseId) {
 		return departmentService.totalStoreCountByEnterpriseId(wxEnterpriseId);
 	}
+	
+	@Override
+	public List<DepartmentDTO> listSonByDepartmentIds(List<String> departmentIdList,String wxEnterpriseId) {
+		List<DepartmentDTO> list = new ArrayList<>();
+		for (String departmentId : departmentIdList) {
+			String chainId = "";
+			TabHaobanDepartment department = departmentService.selectById(departmentId);
+			if(department != null){
+				chainId = department.getChainId() + Constant.ID_SEPARATOR + departmentId;
+			}
+			list.add(EntityUtil.changeEntityByJSON(DepartmentDTO.class, department));
+			if(StringUtils.isNotBlank(chainId)){
+				List<TabHaobanDepartment> tabList = departmentService.listByChainId(chainId,wxEnterpriseId);
+				for (TabHaobanDepartment tabHaobanDepartment : tabList) {
+					list.add(EntityUtil.changeEntityByJSON(DepartmentDTO.class, tabHaobanDepartment));
+				}
+				
+			}
+		}
+		return list;
+	}
+	
 }

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -305,7 +305,9 @@
     <include refid="Base_Column_List" />
     from tab_haoban_department
     where status_flag = 1
-    and   is_store = #{storeFlag,jdbcType=INTEGER}
+    <if test="storeFlag != null">
+    	and is_store = #{storeFlag}
+    </if>
     <if test="departmentIds != null and departmentIds.size() > 0">
     	and department_id IN 
 	    <foreach collection="departmentIds" item="id" index="index" open="(" close=")" separator=",">