fix

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

@@ -22,4 +22,6 @@ public interface TabHaobanApplicationTemplateMapper {
 	TabHaobanApplicationTemplate selectByTemplateName(@Param("templateName")String templateName);
 
 	List<TabHaobanApplicationTemplate> listByTemplateName(@Param("templateName")String applicationTemplateName);
+
+	TabHaobanApplicationTemplate selectDefaultTemplate();
 }
\ No newline at end of file

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

@@ -18,4 +18,6 @@ public interface ApplicationTemplateService {
 
 	List<ApplicationTemplateDTO> listByTemplateName(String applicationTemplateName);
 
+	ApplicationTemplateDTO selectDefaultTemplate();
+
 }

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

@@ -57,4 +57,9 @@ public class ApplicationTemplateServiceImpl implements ApplicationTemplateServic
 		return EntityUtil.changeEntityListByJSON(ApplicationTemplateDTO.class, mapper.listByTemplateName(applicationTemplateName));
 	}
 
+	@Override
+	public ApplicationTemplateDTO selectDefaultTemplate() {
+		return EntityUtil.changeEntityByJSON(ApplicationTemplateDTO.class, mapper.selectDefaultTemplate());
+	}
+
 }

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

@@ -12,17 +12,21 @@ 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.ApplicationTemplateDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 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;
 import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated;
 import com.gic.haoban.manage.service.service.ApplicationService;
+import com.gic.haoban.manage.service.service.ApplicationTemplateService;
 import com.gic.haoban.manage.service.service.TemplateApplicationRelatedService;
 import com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseApplicationRelatedService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 
 import org.springframework.stereotype.Service;
 
@@ -39,6 +43,10 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
 	private TemplateEnterpriseRelatedService templateEnterpriseRelatedService;
 	@Autowired
 	private TemplateApplicationRelatedService templateApplicationRelatedService;
+	@Autowired
+	private ApplicationTemplateService applicationTemplateService;
+	@Autowired
+	private WxEnterpriseService wxEnterpriseService;
 	@Override
 	public List<ApplicationDTO> listApplication() {
 		List<TabHaobanApplication> list = applicationService.listApplication();
@@ -82,9 +90,23 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
 
 	@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);
+		TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
+		if(dto == null){
+			ApplicationTemplateDTO defaultTemplate = applicationTemplateService.selectDefaultTemplate();
+			if(defaultTemplate != null){
+				dto = new TemplateEnterpriseRelatedDTO();
+				dto.setApplicationTemplateId(defaultTemplate.getApplicationTemplateId());
+				dto.setWxEnterpriseId(wxEnterpriseId);
+				WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
+				if(enterprise != null){
+					dto.setWxEnterpriseName(enterprise.getCorpName());
+				}
+				templateEnterpriseRelatedService.insert(dto);
+			}
+		}
+//		List<TabHaobanApplication> list = applicationService.listApplication();
+//		Set<String> applicationSet = list.stream().map(TabHaobanApplication::getApplicationId).collect(Collectors.toSet());
+//		wxEnterpriseApplicationRelatedService.saveEnterpriseApplicationRelateds(applicationSet, wxEnterpriseId);
 	}
 
 }

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

@@ -123,4 +123,12 @@
     </if>
     and status_flag = 1
   </select>
+  
+  <select id="selectDefaultTemplate" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_application_template
+    where default_flag = 1
+    and status_flag = 1
+  </select>
 </mapper>
\ No newline at end of file