Merge branch 'feature/20250618-erqian' into developer

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

@@ -449,16 +449,15 @@ public class LoginController extends WebBaseController {
         if(null != loginUser) {
             logger.info("当前登录信息={}", JSON.toJSON(loginUser));
             vo = EntityUtil.changeEntityByOrika(WebLoginVO.class, loginUser);
-        }
-        String gicHost = this.getGicHost();
-        vo.setGicHost(gicHost);
-
             String clerkId = loginUser.getClerkId();
             ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
             vo.setHasAllStorePermission(0);
             if (null != clerkDTO) {
                 vo.setHasAllStorePermission(isAdminAuthStore(loginUser.getEnterpriseId(), clerkDTO) ? 1:0);
             }
+        }
+        String gicHost = this.getGicHost();
+        vo.setGicHost(gicHost);
 
         return this.success(vo);
     }