caozixuan 2 жил өмнө
parent
commit
fba478b473

+ 3 - 3
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/PushUserTrackService.java

@@ -16,17 +16,17 @@ import java.util.Set;
  * @since 2021-11-04
  */
 public interface PushUserTrackService extends IService<PushUserTrack> {
-
-
     /**
      * 创建用户推送轨迹记录(用户前后角色对比创建)
      *
+     * @param dbRoleIdSet      当前用户数据库中角色集合
      * @param currentRoleIdSet 当前用户角色集合
      * @param userId           当前用户主键
      * @param enable           启用/禁用
+     * @param requestUserId    请求用户id
      * @return 该用户推送轨迹记录集合(0条或2条)
      */
-    List<PushUserTrack> createPushTrackUser(Set<Long> dbRoleIdSet, Set<Long> currentRoleIdSet, Long userId, boolean enable,Long requestUserId);
+    List<PushUserTrack> createPushTrackUser(Set<Long> dbRoleIdSet, Set<Long> currentRoleIdSet, Long userId, boolean enable, Long requestUserId);
 
 
     /**

+ 0 - 1
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.common.base.BaseEntity;
-import com.qmth.teachcloud.common.bean.dto.CourseInfoDto;
 import com.qmth.teachcloud.common.bean.dto.excel.BasicCourseImportDto;
 import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.teachcloud.common.bean.params.BasicCourseParams;

+ 1 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/PushUserTrackServiceImpl.java

@@ -59,6 +59,7 @@ public class PushUserTrackServiceImpl extends ServiceImpl<PushUserTrackMapper, P
         SysPrivilege subjectHeader = sysPrivilegeService.list(new QueryWrapper<SysPrivilege>().lambda()
                 .eq(SysPrivilege::getUrl, SpecialPrivilegeEnum.SUBJECT_HEADER.getId())).get(0);
         Long subjectHeaderId = subjectHeader.getId();
+
         if (currentRoleIdSet.size() > 0) {
             List<SysRolePrivilege> sysRolePrivilegeList = sysRolePrivilegeService.list(new QueryWrapper<SysRolePrivilege>().lambda().in(SysRolePrivilege::getRoleId, currentRoleIdSet));
             Set<Long> priIds = sysRolePrivilegeList.stream().map(SysRolePrivilege::getPrivilegeId).collect(Collectors.toSet());