Merge branch 'bgy' of SH-Arbitrate/Mediation-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/flow/MsCaseFlow.java

@@ -45,4 +45,10 @@ public class MsCaseFlow {
      */
     @Column(name = "back_flow_id")
     private Integer backFlowId;
+
+    /**
+     * 按钮权限标识符
+     */
+    @Column(name = "button_auth_flag")
+    private String buttonAuthFlag;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/flow/MsCaseFlowVO.java

@@ -5,6 +5,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import java.util.List;
 
 
@@ -51,4 +52,9 @@ public class MsCaseFlowVO {
      * 角色id
      */
     private List<Long> roleIds;
+
+    /**
+     * 按钮权限标识符
+     */
+    private String buttonAuthFlag;
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/flow/MsCaseFlowMapper.java

@@ -1,16 +1,7 @@
 package com.ruoyi.system.mapper.flow;
 
 import com.ruoyi.system.domain.entity.flow.MsCaseFlow;
-import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
 public interface MsCaseFlowMapper extends Mapper<MsCaseFlow> {
-    /**
-     * 根据流程查找下一个流程
-     *
-     * @param caseFlowId 流程id
-     * @return
-     */
-    @Select("select f1.id,f1.node_id nodeId,f1.node_name nodeName,f1.case_status_name caseStatusName,f1.back_flow_id backFlowId,f1.sort from ms_case_flow f1 join ms_case_flow f2 on  f2.id=#{caseFlowId}  and f1.sort=f2.sort+1 ")
-    MsCaseFlow nextFlow(Integer caseFlowId);
 }

ruoyi-system/src/main/resources/com/ruoyi/system/mapper/flow/MsCaseFlowMapper.xml

@@ -11,5 +11,6 @@
     <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="case_status_name" jdbcType="VARCHAR" property="caseStatusName" />
     <result column="back_flow_id" jdbcType="INTEGER" property="backFlowId" />
+    <result column="button_auth_flag" jdbcType="VARCHAR" property="buttonAuthFlag" />
   </resultMap>
 </mapper>