Merge remote-tracking branch 'origin/master'

gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java

@@ -64,6 +64,9 @@ public class ApprovalProcessController extends BaseController {
             }
         }
 
+        if (approvalProcess.getSubmitterId() != null){
+            queryWrapper.eq("submitter_id", getLoginUser().getUserId());
+        }
         List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
 
         for (ApprovalProcess process : list) {

gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java

@@ -30,6 +30,7 @@ public class ApprovalProcess {
     private String submitterName;
 
     @ApiModelProperty("提交人ID")
+    @TableField(condition = SqlCondition.EQUAL)
     private Long submitterId;
 
     @ApiModelProperty("抄送人姓名")