commit

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

@@ -5,10 +5,7 @@ import com.budwk.app.base.result.Result;
 import com.budwk.app.client.module.activity.service.ClientItemService;
 import com.budwk.app.client.module.activity.vo.ClientActivitySignVO;
 import com.budwk.app.client.module.activity.vo.ClientItemSignUpVO;
-import com.budwk.app.module.activity.models.ActGroup;
+import com.budwk.app.module.activity.models.*;
-import com.budwk.app.module.activity.models.ActUser;
-import com.budwk.app.module.activity.models.ActivityItem;
-import com.budwk.app.module.activity.models.ActivityItemUser;
 import com.budwk.app.web.commons.auth.satoken.StpClientUtil;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
@@ -16,6 +13,7 @@ import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.adaptor.JsonAdaptor;
 import org.nutz.mvc.annotation.AdaptBy;
@@ -47,14 +45,22 @@ public class ClientItemController {
 
 
     /**
-     * 查询出这个活动所有报名的人
+     * 查询出这个活动自己团队所有报名的人
+     *
      * @param activityId
      * @return
      */
     @At("/list-apply-user/?")
     @SaCheckLogin(type = StpClientUtil.TYPE)
-    public Result listApplyUser(String activityId){
+    public Result listApplyUser(String activityId) {
-        List<ActivityItemUser> userList = dao.query(ActivityItemUser.class, Cnd.where(ActivityItemUser::getActivityId, "=", activityId));
+        //查询自己在哪个团队
+        ActGroupUser user = dao.fetch(ActGroupUser.class, Cnd.where(ActGroupUser::getActivityId, "=", activityId).and(ActGroupUser::getUserId, "=", StpClientUtil.STP.getLoginIdAsLong()));
+        if (Lang.isEmpty(user)) {
+            return Result.error("您还没加入任何团队");
+        }
+        List<ActivityItemUser> userList = dao.query(ActivityItemUser.class,
+                Cnd.where(ActivityItemUser::getActivityId, "=", activityId)
+                        .and(ActivityItemUser::getGroupId, "=", user.getGroupId()));
         return Result.success(userList);
     }
 
@@ -74,10 +80,16 @@ public class ClientItemController {
     @At("/list-team-user/?")
     @SaCheckLogin(type = StpClientUtil.TYPE)
     public Result listTeamUser(Long activityId) {
+        //查询自己在哪个团队
+        ActGroupUser user = dao.fetch(ActGroupUser.class, Cnd.where(ActGroupUser::getActivityId, "=", activityId).and(ActGroupUser::getUserId, "=", StpClientUtil.STP.getLoginIdAsLong()));
+        if (Lang.isEmpty(user)) {
+            return Result.error("您还没加入任何团队");
+        }
         Sql sql = Sqls.create("""
                 SELECT
                   t1.groupId,
                   t1.userId,
+                  t1.isLeader,
                   t2.activityId,
                   t3.userName,
                   t3.unitName,
@@ -88,7 +100,8 @@ public class ClientItemController {
                   LEFT JOIN act_user t3 ON t3.userId = t1.userId
                 WHERE
                   t2.activityId = @activityId
-                """).setParam("activityId", activityId);
+                  AND t1.groupId=@groupId
+                """).setParam("activityId", activityId).setParam("groupId", user.getGroupId());
         List<NutMap> list = clientItemService.listMap(sql);
         return Result.success(list);
     }

backend/src/main/java/com/budwk/app/client/module/activity/service/impl/ClientItemServiceImpl.java

@@ -3,8 +3,10 @@ package com.budwk.app.client.module.activity.service.impl;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.client.module.activity.service.ClientItemService;
 import com.budwk.app.client.module.activity.vo.ClientItemSignUpVO;
+import com.budwk.app.module.activity.models.ActGroupUser;
 import com.budwk.app.module.activity.models.Activity;
 import com.budwk.app.module.activity.models.ActivityItemUser;
+import com.budwk.app.web.commons.auth.satoken.StpClientUtil;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
@@ -28,9 +30,15 @@ public class ClientItemServiceImpl extends BaseServiceImpl<ActivityItemUser> imp
         if (activity.getItemEndTime().isBefore(LocalDateTime.now())){
             throw new RuntimeException("项目报名已结束!");
         }
+        //找到自己的团队
+        ActGroupUser groupUser = dao().fetch(ActGroupUser.class,
+                Cnd.where(ActGroupUser::getActivityId, "=", signVO.getActivityId())
+                        .and(ActGroupUser::getUserId, "=", StpClientUtil.STP.getLoginIdAsLong()));
+
+
         // 删除掉之前的
         clear(Cnd.where(ActivityItemUser::getActivityId, "=", signVO.getActivityId())
-                .and(ActivityItemUser::getGroupId, "=", signVO.getGroupId())
+                .and(ActivityItemUser::getGroupId, "=", groupUser.getGroupId())
                 .and(ActivityItemUser::getItemId, "=", signVO.getItemId())
         );
 
@@ -39,7 +47,7 @@ public class ClientItemServiceImpl extends BaseServiceImpl<ActivityItemUser> imp
             ActivityItemUser itemUser = new ActivityItemUser();
             itemUser.setActivityId(signVO.getActivityId());
             itemUser.setItemId(signVO.getItemId());
-            itemUser.setGroupId(signVO.getGroupId());
+            itemUser.setGroupId(groupUser.getGroupId());
             itemUser.setUserId(userId);
             userList.add(itemUser);
         }

frontend/src/pages/activity/team-form/index.vue

@@ -59,13 +59,14 @@
                   :value="member.userId"
                   :label="member.userName+'-'+member.sex"
                   :content="member.unitName"
+                  :disabled="!isSelfLeader"
                   icon-size="20px"
               />
             </view>
           </t-checkbox-group>
         </view>
-        <view class="picker-footer">
+        <view class="picker-footer"v-if="isSelfLeader">
-          <t-button block theme="primary" @click="submitRegistration" >
+          <t-button block theme="primary" @click="submitRegistration">
             确认报名 ({{ selectedMemberIds.length }}人)
           </t-button>
         </view>
@@ -129,7 +130,6 @@ const selectedMemberIds = ref([]);
 const showMemberPicker = ref(false);
 
 
-
 // 获取活动列表
 async function listActs() {
   try {
@@ -165,17 +165,21 @@ async function listItems() {
   }
 }
 
+// 自己是否是队长
+const isSelfLeader = ref(false)
+
 // 获取团队成员
 async function listTeamUser() {
   try {
     const {code, data, msg} = await request.get('/client/item/list-team-user/' + selectActId.value)
     if (code === 0) {
       teamMembers.value = data;
+      isSelfLeader.value = data.find(t => t.userId===getApp().globalData.user.id)?.isLeader
     } else {
       Toast.error(msg)
     }
   } catch (e) {
-    Toast.error(msg)
+    Toast.error(e)
     console.error(e)
   }
 }
@@ -184,7 +188,6 @@ async function listTeamUser() {
 const registrationStatus = ref(new Map());
 // 获取报名状态 - 使用静态数据
 const fetchRegistrationStatus = () => {
-
   const resultMap = selectedMemberList.value.reduce((acc, item) => {
     const key = item.itemId;
     if (!acc.has(key)) {
@@ -194,6 +197,7 @@ const fetchRegistrationStatus = () => {
     return acc;
   }, new Map());
   registrationStatus.value = resultMap;
+  console.log(resultMap)
 };
 
 // 选择项目

frontend/src/pages/activity/team/index.vue

@@ -41,9 +41,10 @@
         </div>
 
         <!-- 项目报名按钮 -->
-        <div class="action-section" >
+        <div class="action-section">
-          <t-button block theme="danger" size="large" class="register-btn" @click="goToEventRegistration">
+          <t-button block theme="danger" size="large" class="register-btn" @click="goToEventRegistration" :disabled="!team.teamIsLeader">
-            {{ team.isSelfLeader ? '参与项目报名' : '查看项目报名' }}
+            <div v-if="team.teamIsLeader"> {{ team.isSelfLeader ? '参与项目报名' : '查看项目报名' }}</div>
+            <div v-else>暂无队长无法报名</div>
           </t-button>
         </div>
 
@@ -80,8 +81,19 @@
                 <div class="role-desc">拥有团队所有管理权限</div>
               </div>
             </div>
+            <div v-if="team.teamIsLeader&&!team.isSelfLeader">
+              <div class="role-card">
+                <div class="role-icon">
+                  <i class="bi bi-person"></i>
+                </div>
+                <div class="role-info">
+                  <div class="role-title">您是普通成员</div>
+                  <div class="role-desc">项目报名请联系队长</div>
+                </div>
+              </div>
+            </div>
 
-            <div v-else>
+            <div v-if="!team.teamIsLeader&&!team.isSelfLeader">
               <div class="role-card">
                 <div class="role-icon">
                   <i class="bi bi-person"></i>
@@ -104,10 +116,10 @@
       </div>
     </view>
     <view v-else style="background-color: #FFFFFF">
-      <view >
+      <view>
         <t-result>
           <template #image>
-            <t-image src="https://tdesign.gtimg.com/mobile/demos/result1.png" class="external-class-image" />
+            <t-image src="https://tdesign.gtimg.com/mobile/demos/result1.png" class="external-class-image"/>
           </template>
           <template #title>
             <div>暂无团队</div>
@@ -207,8 +219,7 @@ const getTeamInfo = async () => {
     const {code, msg, data} = await useRequest().post('/client/group/info/' + pageForm.actId);
     if (code === 0) {
       team.value = data
-      console.log(team.value.groupUsers.find(t=>t.userId===uni.getStorageSync('userId')))
+      team.value.teamIsLeader = !!team.value.groupUsers.find(t => t.isLeader)
-      console.log()
     } else {
       Toast({message: msg, theme: 'error'});
     }

frontend/src/pages/profile/index.vue

@@ -5,11 +5,11 @@ import {useRequest} from "@/utils/request";
 
 // 用户资料数据
 const userInfo = ref({
-  id: '10001',
+  id: '--',
-  name: '张三',
+  name: '--',
   avatar: '/static/avatar.png',
-  phone: '188****8888',
+  phone: '--',
-  company: '腾讯科技有限公司'
+  company: '--'
 });
 
 // 我的活动数据
@@ -55,6 +55,13 @@ const handleEditProfile = () => {
 onMounted(() => {
   // 获取用户信息
   console.log('个人资料页面已加载');
+  userInfo.value={
+    id: getApp().globalData.user.id,
+    name: getApp().globalData.user.userName,
+    avatar: '/static/avatar.png',
+    phone: getApp().globalData.user.phone,
+    company: getApp().globalData.user.unitName
+  }
 });
 </script>
 
@@ -76,7 +83,7 @@ onMounted(() => {
               <t-icon name="edit" size="20"/>
             </view>
           </view>
-          <view class="user-company">{{ userInfo.company }}</view>
+          <view class="user-company">{{ userInfo.phone }}</view>
         </view>
       </view>
     </view>