|
@@ -24,6 +24,8 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
|
|
|
default PageResult<UserAchievementDO> selectPage(UserAchievementPageReqVO reqVO) {
|
|
|
Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
|
|
|
System.out.println(loginID);
|
|
|
+ // TODO 和下面同理
|
|
|
+
|
|
|
return selectPage(reqVO, new LambdaQueryWrapperX<UserAchievementDO>()
|
|
|
.eqIfPresent(UserAchievementDO::getUserId, reqVO.getUserId())
|
|
|
.likeIfPresent(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
|
|
@@ -38,6 +40,12 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
|
|
|
//导师
|
|
|
default PageResult<UserAchievementDO> selectTeacherPage(UserAchievementPageReqVO reqVO) {
|
|
|
Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
|
|
|
+ // TODO 逻辑还是稍微有点混乱,UserAchievementPageReqVO里面可以直接加入deptId这个参数,
|
|
|
+ // 这样就不需要再另外查询了,就是成果表中加入一个dept_id字段,然后查询的时候直接用这个字段来查询(看了一下,发现你是存了的,为啥不直接用)
|
|
|
+ // 如果需要查询,也不建议用下面这种,如果dept_id出现问题应该会报错
|
|
|
+ // 而且我看这个逻辑好像没把老师筛选出来
|
|
|
+
|
|
|
+
|
|
|
return selectPage(reqVO, new LambdaQueryWrapperX<UserAchievementDO>()
|
|
|
.eqIfPresent(UserAchievementDO::getUserId, reqVO.getUserId())
|
|
|
.likeIfPresent(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
|
|
@@ -48,6 +56,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
|
|
|
//找到这个工作室下的人员成果
|
|
|
.inSql(UserAchievementDO::getDeptId,String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
|
|
|
// 找到这个工作室下的人员成果,3导师
|
|
|
+ // TODO 这里的筛选应该是无效筛选,没有达成目的
|
|
|
.inSql(UserAchievementDO::getDeptId,
|
|
|
String.format("SELECT dept_id FROM system_users WHERE id = %d AND user_type = 3", loginID))
|
|
|
.orderByDesc(UserAchievementDO::getCreateTime));
|
|
@@ -82,6 +91,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
|
|
|
.betweenIfPresent(UserAchievementDO::getCreateTime, reqVO.getCreateTime())
|
|
|
.eqIfPresent(UserAchievementDO::getDetail, reqVO.getDetail())
|
|
|
//找到这个自己的成果
|
|
|
+ //TODO 怎么还插入了一段原生sql哈哈哈哈,直接.eqIfPresent(UserAchievementDO::getUserId, loginID)即可
|
|
|
.inSql(UserAchievementDO::getUserId,String.format("SELECT id FROM system_users WHERE id = %d", loginID))
|
|
|
.orderByDesc(UserAchievementDO::getCreateTime));
|
|
|
}
|