默认商户

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

@@ -133,9 +133,12 @@ public class LoginController extends WebBaseController {
             return this.fail("企微下无管理GIC商户");
         }
         String gicEnterpriseId = list.get(0).getEnterpriseId();
-        for(EnterpriseDetailDTO item : list) {
-            if(item.getDefaultFlag()==1) {
-                gicEnterpriseId = item.getEnterpriseId() ;
+        HaobanUserDTO dto =  this.haobanUserApiService.selectByPhone(wxEnterpriseId,loginPhoneNumber) ;
+        if(null != dto && StringUtils.isNotBlank(dto.getDefaultGicEid())) {
+            for(EnterpriseDetailDTO item : list) {
+                if(item.getEnterpriseId().equals(dto.getDefaultGicEid())) {
+                    gicEnterpriseId = item.getEnterpriseId() ;
+                }
             }
         }
         String code = this.doLogin(wxEnterpriseId, gicEnterpriseId, loginPhoneNumber, "gic", response);