fix: 修复合同列表用户区分

src/main/java/cn/com/poc/covenant/query/ExtractionTaskQuery.sql

@@ -2,6 +2,7 @@ select id,
        task_id,
        file_url,
        file_name,
+       user_id,
        action_type,
        review_status,
        review_error_msg,
@@ -14,6 +15,13 @@ select id,
        MODIFIED_TIME
 
 from biz_extraction_review_task
-where is_deleted = 'N' <<and task_id = :taskId>>
-    <<and LOCATE(:search,file_name)>> <<and action_type = :actionType>>
+where is_deleted = 'N'
+    <<
+  and user_id = :userId >>
+    <<
+  and task_id = :taskId >>
+    <<
+  and LOCATE(:search, file_name) >>
+    <<
+  and action_type = :actionType >>
 order by CREATED_TIME desc
\ No newline at end of file

src/main/java/cn/com/poc/covenant/query/ExtractionTaskQueryCondition.java

@@ -39,4 +39,13 @@ public class ExtractionTaskQueryCondition implements Serializable {
         this.actionType = actionType;
     }
 
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
 }
\ No newline at end of file

src/main/java/cn/com/poc/covenant/query/ExtractionTaskQueryItem.java

@@ -10,72 +10,89 @@ import java.io.Serializable;
  * Query Item class for ExtractionTaskQuery
  */
 @Entity
-public class ExtractionTaskQueryItem extends BaseItemClass implements Serializable{
+public class ExtractionTaskQueryItem extends BaseItemClass implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    
-    /** id
-    *id
-    */ 
+
+    /**
+     * id
+     * id
+     */
     private Integer id;
-    
+
     @Column(name = "id")
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
-    
-    public void setId(Integer id){
+
+    public void setId(Integer id) {
         this.id = id;
     }
-    
-    /** task_id
-    *task_id
-    */ 
+
+    /**
+     * task_id
+     * task_id
+     */
     private String taskId;
-    
+
     @Column(name = "task_id")
-    public String getTaskId(){
+    public String getTaskId() {
         return this.taskId;
     }
-    
-    public void setTaskId(String taskId){
+
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
-    
-    /** file_url
-    *file_url
-    */ 
+
+
+    private Long userId;
+
+    @Column(name = "user_id")
+    public Long getUserId() {
+        return this.userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * file_url
+     * file_url
+     */
     private String fileUrl;
-    
+
     @Column(name = "file_url")
-    public String getFileUrl(){
+    public String getFileUrl() {
         return this.fileUrl;
     }
-    
-    public void setFileUrl(String fileUrl){
+
+    public void setFileUrl(String fileUrl) {
         this.fileUrl = fileUrl;
     }
-    
-    /** file_name
-    *file_name
-    */ 
+
+    /**
+     * file_name
+     * file_name
+     */
     private String fileName;
-    
+
     @Column(name = "file_name")
-    public String getFileName(){
+    public String getFileName() {
         return this.fileName;
     }
-    
-    public void setFileName(String fileName){
+
+    public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
-    /** actionType
-     *执行动作（审查，提取，对比）
+    /**
+     * actionType
+     * 执行动作（审查，提取，对比）
      */
     private String actionType;
 
-    @Column(name = "action_type",length = 100)
+    @Column(name = "action_type", length = 100)
     public String getActionType() {
         return actionType;
     }
@@ -83,131 +100,140 @@ public class ExtractionTaskQueryItem extends BaseItemClass implements Serializab
     public void setActionType(String actionType) {
         this.actionType = actionType;
     }
-    
-    /** review_status
-    *review_status
-    */ 
+
+    /**
+     * review_status
+     * review_status
+     */
     private String reviewStatus;
-    
+
     @Column(name = "review_status")
-    public String getReviewStatus(){
+    public String getReviewStatus() {
         return this.reviewStatus;
     }
-    
-    public void setReviewStatus(String reviewStatus){
+
+    public void setReviewStatus(String reviewStatus) {
         this.reviewStatus = reviewStatus;
     }
-    
-    /** review_error_msg
-    *review_error_msg
-    */ 
+
+    /**
+     * review_error_msg
+     * review_error_msg
+     */
     private String reviewErrorMsg;
-    
+
     @Column(name = "review_error_msg")
-    public String getReviewErrorMsg(){
+    public String getReviewErrorMsg() {
         return this.reviewErrorMsg;
     }
-    
-    public void setReviewErrorMsg(String reviewErrorMsg){
+
+    public void setReviewErrorMsg(String reviewErrorMsg) {
         this.reviewErrorMsg = reviewErrorMsg;
     }
-    
-    /** text_in_task_id
-    *text_in_task_id
-    */ 
+
+    /**
+     * text_in_task_id
+     * text_in_task_id
+     */
     private String textInTaskId;
-    
+
     @Column(name = "text_in_task_id")
-    public String getTextInTaskId(){
+    public String getTextInTaskId() {
         return this.textInTaskId;
     }
-    
-    public void setTextInTaskId(String textInTaskId){
+
+    public void setTextInTaskId(String textInTaskId) {
         this.textInTaskId = textInTaskId;
     }
-    
-    /** contract_type
-    *contract_type
-    */ 
+
+    /**
+     * contract_type
+     * contract_type
+     */
     private String contractType;
-    
+
     @Column(name = "contract_type")
-    public String getContractType(){
+    public String getContractType() {
         return this.contractType;
     }
-    
-    public void setContractType(String contractType){
+
+    public void setContractType(String contractType) {
         this.contractType = contractType;
     }
-    
-    /** is_deleted
-    *is_deleted
-    */ 
+
+    /**
+     * is_deleted
+     * is_deleted
+     */
     private String isDeleted;
-    
+
     @Column(name = "is_deleted")
-    public String getIsDeleted(){
+    public String getIsDeleted() {
         return this.isDeleted;
     }
-    
-    public void setIsDeleted(String isDeleted){
+
+    public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    
-    /** CREATOR
-    *CREATOR
-    */ 
+
+    /**
+     * CREATOR
+     * CREATOR
+     */
     private String creator;
-    
+
     @Column(name = "CREATOR")
-    public String getCreator(){
+    public String getCreator() {
         return this.creator;
     }
-    
-    public void setCreator(String creator){
+
+    public void setCreator(String creator) {
         this.creator = creator;
     }
-    
-    /** CREATED_TIME
-    *CREATED_TIME
-    */ 
+
+    /**
+     * CREATED_TIME
+     * CREATED_TIME
+     */
     private java.util.Date createdTime;
-    
+
     @Column(name = "CREATED_TIME")
-    public java.util.Date getCreatedTime(){
+    public java.util.Date getCreatedTime() {
         return this.createdTime;
     }
-    
-    public void setCreatedTime(java.util.Date createdTime){
+
+    public void setCreatedTime(java.util.Date createdTime) {
         this.createdTime = createdTime;
     }
-    
-    /** MODIFIER
-    *MODIFIER
-    */ 
+
+    /**
+     * MODIFIER
+     * MODIFIER
+     */
     private String modifier;
-    
+
     @Column(name = "MODIFIER")
-    public String getModifier(){
+    public String getModifier() {
         return this.modifier;
     }
-    
-    public void setModifier(String modifier){
+
+    public void setModifier(String modifier) {
         this.modifier = modifier;
     }
-    
-    /** MODIFIED_TIME
-    *MODIFIED_TIME
-    */ 
+
+    /**
+     * MODIFIED_TIME
+     * MODIFIED_TIME
+     */
     private java.util.Date modifiedTime;
-    
+
     @Column(name = "MODIFIED_TIME")
-    public java.util.Date getModifiedTime(){
+    public java.util.Date getModifiedTime() {
         return this.modifiedTime;
     }
-    
-    public void setModifiedTime(java.util.Date modifiedTime){
+
+    public void setModifiedTime(java.util.Date modifiedTime) {
         this.modifiedTime = modifiedTime;
     }
-    
+
 } 
\ No newline at end of file

src/main/java/cn/com/poc/covenant/rest/impl/ExtractionRestImpl.java

@@ -187,9 +187,17 @@ public class ExtractionRestImpl implements ExtractionRest {
     @Override
     public List<ReviewProgressDto> reviewProgressList(String reviewTaskId, String search, String actionType) {
         Assert.notNull(reviewTaskId);
+
+
+        UserBaseEntity currentUser = BlContext.getCurrentUserNotException();
+
+        if (currentUser == null) {
+            throw new BusinessException("用户未登录");
+        }
         ExtractionTaskQueryCondition condition = new ExtractionTaskQueryCondition();
         condition.setTaskId(reviewTaskId);
         condition.setSearch(search);
+        condition.setUserId(currentUser.getUserId());
         condition.setActionType(actionType);
         List<ExtractionTaskQueryItem> extractionTaskQueryItems = bizExtractionReviewTaskService.extractionTaskQuery(condition, null);
         List<ReviewProgressDto> reviewProgressDtos = new ArrayList<>();