commit

backend/src/main/java/com/budwk/app/client/auth/controller/ClientAuthController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckLogin;
 import com.budwk.app.base.constant.RedisConstant;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.result.Result;
+import com.budwk.app.client.auth.models.Client_user;
 import com.budwk.app.client.auth.service.ClientAuthService;
 import com.budwk.app.client.auth.vo.ClientLoginBody;
 import com.budwk.app.sys.services.SysMsgService;
@@ -86,6 +87,15 @@ public class ClientAuthController {
         }
     }
 
+    @At("/info")
+    @Ok("json")
+    @SaCheckLogin(type = StpClientUtil.TYPE)
+    public Result info() {
+        Client_user user = dao.fetch(Client_user.class, StpClientUtil.STP.getLoginIdAsLong());
+        return Result.success(user);
+    }
+
+
     /**
      * 退出登录
      */

backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientGroupController.java

@@ -69,10 +69,20 @@ public class ClientGroupController {
         return Result.success(list);
     }
 
+    /**
+     * 查询自己在那个团队
+     * @param activityId
+     * @return
+     */
     @At("/info/?")
     @SaCheckLogin(type = StpClientUtil.TYPE)
     public Result info(Long activityId) {
-        Sql sql = Sqls.create("select * from act_group where activityId=@activityId").setParam("activityId", activityId);
+        ActGroupUser groupUser = dao.fetch(ActGroupUser.class, Cnd.where(ActGroupUser::getUserId, "=", StpClientUtil.STP.getLoginIdAsLong())
+                .and(ActGroupUser::getActivityId, "=", activityId));
+        if(Lang.isEmpty(groupUser)){
+            return Result.error("您还没加入任何团队");
+        }
+        Sql sql = Sqls.create("select * from act_group where id=@id").setParam("id", groupUser.getGroupId());
         sql.setCallback(Sqls.callback.map());
         NutMap map = (NutMap) dao.execute(sql).getResult();
         Sql sqlGroupUser = Sqls.create("""
@@ -85,6 +95,8 @@ public class ClientGroupController {
                   `act_group_user` t1
                   LEFT JOIN act_user t2 ON t1.userId = t2.userId
                 WHERE t1.groupId=@groupId
+                   ORDER BY
+                     t1.isLeader DESC
                 """).setParam("groupId", map.getString("id"));
         List<NutMap> groupUsers = clientActivityService.listMap(sqlGroupUser);
         map.put("groupUsers", groupUsers);