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

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -55,6 +56,9 @@ public class ApplicationSettingApiServiceImpl implements ApplicationSettingApiSe
 	@Override
 	public List<ApplicationSettingDTO> listOpenByWxEnterpriseIdAndApplicationIds(
 			String wxEnterpriseId, List<String> applicationIds) {
+		if(applicationIds == null || applicationIds.isEmpty()){
+			return Collections.EMPTY_LIST;
+		}
 	    List<TabHaobanApplicationSetting> list = applicationSettingMapper.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId,applicationIds);
 		if(CollectionUtil.isEmpty(list)){
 			return null;

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

@@ -276,4 +276,11 @@ public class ApplicationController extends WebBaseController{
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
+	
+	@RequestMapping("init-application-relation")
+	@IgnoreLogin
+	public HaobanResponse insertApplicationRelation(String wxEnterpriseId){
+		applicationApiService.insertApplicationRelation(wxEnterpriseId);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
 }