Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -25,7 +25,9 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
 		wxDTO.setWxEnterpriseId(StringUtil.randomUUID());
 		wxDTO.setCreateTime(now);
 		wxDTO.setUpdateTime(now);
-		mapper.insertSelective(EntityUtil.changeEntityByJSON(TabHaobanWxEnterprise.class, wxDTO));
+		TabHaobanWxEnterprise tabHaobanWxEnterprise = EntityUtil.changeEntityByJSON(TabHaobanWxEnterprise.class, wxDTO);
+		tabHaobanWxEnterprise.setStatusFlag(1);
+		mapper.insertSelective(tabHaobanWxEnterprise);
 		return wxDTO.getWxEnterpriseId();
 		
 	}

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

@@ -157,7 +157,7 @@ public class MessageApiServiceImpl implements MessageApiService {
     private void dealUser(QywxCallBackDTO qywxCallBackDTO){
         TabHaobanStaff staff = new TabHaobanStaff();
         TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(qywxCallBackDTO.getAuthCorpId());
-        if(enterprise == null){
+        if(enterprise != null){
             staff.setWxEnterpriseId(enterprise.getWxEnterpriseId());
             staff.setActiveFlag(0);
             staff.setPhoneNumber(qywxCallBackDTO.getMobile());