Browse Source

10.17,部门信息

Crazy 9 months ago
parent
commit
fce8750e67

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java

@@ -117,7 +117,7 @@ public class DeptController {
                 supervisor.add(ad);
             }
             userAchievements = new ArrayList<>();
-            userAchievements.add(userAchievementService.getUserAchievement(Math.toIntExact(ad.getId())).getDetail());
+            userAchievements.add(userAchievementService.getUserAchievementbyUserId(Math.toIntExact(ad.getId())).getDetail());
         }
         newDept.setSupervisorNum(String.valueOf(supervisor.stream().count()));
         newDept.setStudentNum(String.valueOf(student.stream().count()));

+ 3 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/userAchievement/UserAchievementMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.dal.dataobject.userAchievement.UserAchievementDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.system.controller.admin.userAchievement.vo.*;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 成果 Mapper
@@ -47,5 +48,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .inSql(UserAchievementDO::getUserId,String.format("SELECT id FROM system_users WHERE id = %d", loginID))
                 .orderByDesc(UserAchievementDO::getId));
     }
+    @Select("SELECT * FROM system_user_achievement WHERE user_id = #{userId}")
+     UserAchievementDO selectUserAchievementById(int userId);
 
 }

+ 2 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userAchievement/UserAchievementService.java

@@ -47,6 +47,8 @@ public interface UserAchievementService {
      */
     UserAchievementDO getUserAchievement(Integer id);
 
+    UserAchievementDO getUserAchievementbyUserId(Integer id);
+
     /**
      * 获得成果分页
      *

+ 5 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userAchievement/UserAchievementServiceImpl.java

@@ -83,6 +83,11 @@ public class UserAchievementServiceImpl implements UserAchievementService {
         return userAchievementMapper.selectById(id);
     }
 
+    @Override
+    public UserAchievementDO getUserAchievementbyUserId(Integer id) {
+        return userAchievementMapper.selectUserAchievementById(id);
+    }
+
     @Override
     public PageResult<UserAchievementDO> getUserAchievementPage(UserAchievementPageReqVO pageReqVO) {
         return userAchievementMapper.selectPage(pageReqVO);