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

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

@@ -12,4 +12,6 @@ public interface ApplicationApiService {
 
 	List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId);
 
+	void insertApplicationRelation(String wxEnterpriseId);
+
 }

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

@@ -11,6 +11,7 @@ import cn.hutool.core.collection.CollectionUtil;
 
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.manage.api.dto.ApplicationDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.api.service.ApplicationApiService;
 import com.gic.haoban.manage.service.dao.mapper.ApplicationMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanApplication;
@@ -64,4 +65,11 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
 		return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, result);
 	}
 
+	@Override
+	public void insertApplicationRelation(String wxEnterpriseId) {
+		List<TabHaobanApplication> list = applicationService.listApplication();
+		Set<String> applicationSet = list.stream().map(TabHaobanApplication::getApplicationId).collect(Collectors.toSet());
+		wxEnterpriseApplicationRelatedService.saveEnterpriseApplicationRelateds(applicationSet, wxEnterpriseId);
+	}
+
 }

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

@@ -144,6 +144,8 @@ public class ApplicationController extends WebBaseController{
 				dealSyncOperationApiService.dealQywxDepartment(taskId, wxEnterpriseId);
 				enterpriseDTO.setContactFlag(1);
 				wxEnterpriseApiService.update(enterpriseDTO);
+				
+				applicationApiService.insertApplicationRelation(wxEnterpriseId);
 //				log.info("【初始化部门调用】{},{},{}",RouterConstant.INIT_WX_DEPARTMENT_SERVICENAME,RouterConstant.INIT_WX_DEPARTMENT_METHODNAME,wxEnterpriseId);
 //		        try {
 //					GICMQClientUtil.getClientInstance().sendCommonMessage(RouterConstant.ROUTERTYPE, wxEnterpriseId,