fix

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

@@ -160,5 +160,7 @@ public interface DepartmentApiService {
     ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String wxUserId);
 	
     void initwxDepartmentMQ(String res);
+    
+	boolean initLock(String wxEnterpriseId);
 
 }

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

@@ -513,6 +513,12 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		RedisUtil.unlock("init_enterprise_" + wxEnterpriseId);
 	}
 	
+	@Override
+	public boolean initLock(String wxEnterpriseId){
+		return RedisUtil.isLocked("init_enterprise_" + wxEnterpriseId);
+		
+	}
+	
 
 
 	private void addAllDepartment(List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list, Integer parentId,

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

@@ -109,9 +109,14 @@ public class ApplicationController extends WebBaseController{
 		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(enterpriseDTO != null){
 			if(StringUtils.isNotBlank(enterpriseDTO.getContactSecret()) && enterpriseDTO.getContactFlag() != null && enterpriseDTO.getContactFlag() == 0){
-				this.departmentApiService.initwxDepartment(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), enterpriseDTO.getWxEnterpriseId());
-				enterpriseDTO.setContactFlag(1);
-				wxEnterpriseApiService.update(enterpriseDTO);
+				
+				log.info("【初始化部门调用】{},{},{}",RouterConstant.INIT_WX_DEPARTMENT_SERVICENAME,RouterConstant.INIT_WX_DEPARTMENT_METHODNAME,wxEnterpriseId);
+		        try {
+					GICMQClientUtil.getClientInstance().sendCommonMessage(RouterConstant.ROUTERTYPE, wxEnterpriseId,
+					 		RouterConstant.INIT_WX_DEPARTMENT_SERVICENAME, RouterConstant.INIT_WX_DEPARTMENT_METHODNAME);
+				} catch (Exception e) {
+					log.info(e.getMessage(),e);
+				}
 			}
 		}
 		
@@ -162,7 +167,7 @@ public class ApplicationController extends WebBaseController{
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(enterpriseDTO != null){
-			if(StringUtils.isNotBlank(enterpriseDTO.getContactSecret()) && enterpriseDTO.getContactFlag() != null){
+			if(StringUtils.isNotBlank(enterpriseDTO.getContactSecret()) && enterpriseDTO.getContactFlag() != null && enterpriseDTO.getContactFlag() == 0){
 				
 				log.info("【初始化部门调用】{},{},{}",RouterConstant.INIT_WX_DEPARTMENT_SERVICENAME,RouterConstant.INIT_WX_DEPARTMENT_METHODNAME,wxEnterpriseId);
 		        try {