美术阅卷12月新增需求-BUG修复

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/UserApi.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.stmms.ms.admin.api;
 
+import cn.com.qmth.stmms.ms.core.domain.MarkLog;
 import cn.com.qmth.stmms.ms.core.domain.MarkStage;
 import cn.com.qmth.stmms.ms.core.domain.MarkSubject;
 import cn.com.qmth.stmms.ms.core.domain.user.MarkRight;
@@ -147,7 +148,7 @@ public class UserApi {
     @RequestMapping(value = "collect/{domain}", method = RequestMethod.PUT)
     public void updateCollect(@PathVariable MarkUser domain, @RequestBody MarkUser user) {
         //开始采集，不能修改
-        List<MarkUser> list = markLogRepo.findByCreateUserId(domain.getId());
+        List<MarkLog> list = markLogRepo.findByCreateUserId(domain.getId());
         if (list != null && list.size() > 0 && !domain.getLoginName().equals(user.getLoginName())) {
             throw new RuntimeException("已有采集记录，不能修改账号");
         }
@@ -170,7 +171,7 @@ public class UserApi {
     @RequestMapping(value = "collect/{userId}", method = RequestMethod.DELETE)
     public void removeCollect(@PathVariable Long userId) {
         //开始采集，不能删除
-        List<MarkUser> list = markLogRepo.findByCreateUserId(userId);
+        List<MarkLog> list = markLogRepo.findByCreateUserId(userId);
         if (list != null && list.size() > 0) {
             throw new RuntimeException("已有采集记录，不能删除");
         }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/MarkLogRepo.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.stmms.ms.core.repository;
 
 import cn.com.qmth.stmms.ms.core.domain.MarkLog;
-import cn.com.qmth.stmms.ms.core.domain.user.MarkUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -26,7 +25,7 @@ public interface MarkLogRepo extends JpaRepository<MarkLog, Long>, JpaSpecificat
      */
     public MarkLog findTopByCreateUserIdAndOperTypeAndSubjectAndExamNumberOrderByCreateTimeDesc(Long createUserId, Integer operType, String subject, String examNumber);
 
-    List<MarkUser> findByCreateUserId(Long userId);
+    List<MarkLog> findByCreateUserId(Long userId);
 
     void deleteByPaperIdIn(List<Long> paperIds);
 }