3.3.51

xlorne · xlorne · commit f5f31c4baa61 · 2025-01-03T10:17:59.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/src/main/java/com/codingapi/example/query/FlowRecordQueryImpl.java b/example/example-infra-flow/src/main/java/com/codingapi/example/query/FlowRecordQueryImpl.java
@@ -18,6 +18,12 @@ public class FlowRecordQueryImpl implements FlowRecordQuery {
     private final FlowRecordEntityRepository flowRecordEntityRepository;
     private final UserRepository userRepository;
 
+
+    @Override
+    public FlowRecord getFlowRecordById(long id) {
+        return FlowRecordConvertor.convert(flowRecordEntityRepository.getFlowRecordEntityById(id),userRepository);
+    }
+
     @Override
     public Page<FlowRecord> findAll(PageRequest pageRequest) {
         Page<FlowRecordEntity> page = flowRecordEntityRepository.findAllFlowRecords(pageRequest);
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.50</version>
+    <version>3.3.51</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.50</version>
+    <version>3.3.51</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java
@@ -9,6 +9,7 @@
 import com.codingapi.springboot.flow.error.OperatorResult;
 import com.codingapi.springboot.flow.pojo.FlowResult;
 import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
+import com.codingapi.springboot.flow.query.FlowRecordQuery;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.result.MessageResult;
 import com.codingapi.springboot.flow.service.FlowService;
@@ -67,8 +68,13 @@ public Object getBean(String beanName) {
     }
 
 
+    public <T> T getBean(Class<T> clazz) {
+        return provider.getBean(clazz);
+    }
+
+
     /**
-     *  获取审批意见
+     * 获取审批意见
      */
     public String getAdvice() {
         if (opinion != null) {
@@ -179,16 +185,18 @@ public MessageResult rejectFlow() {
 
     /**
      * 是否为驳回状态
+     *
      * @return 是否为驳回状态
      */
-    public boolean isRejectState(){
-        List<FlowRecord> historyRecords = this.historyRecords;
-        if(historyRecords!=null) {
-            for (FlowRecord record : historyRecords) {
-                if (record.getId() == this.flowRecord.getPreId()) {
-                    return record.getFlowSourceDirection() == FlowSourceDirection.REJECT;
-                }
-            }
+    public boolean isRejectState() {
+        long preId = flowRecord.getPreId();
+        if (preId == 0) {
+            return false;
+        }
+        FlowRecordQuery flowRecordQuery = getBean(FlowRecordQuery.class);
+        FlowRecord preRecord = flowRecordQuery.getFlowRecordById(preId);
+        if (preRecord != null) {
+            return preRecord.getFlowSourceDirection() == FlowSourceDirection.REJECT;
         }
         return false;
     }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSessionBeanProvider.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSessionBeanProvider.java
@@ -27,4 +27,11 @@ public Object getBean(String beanName) {
         return null;
     }
 
+    public <T> T getBean(Class<T> clazz) {
+        if (spring != null) {
+            return spring.getBean(clazz);
+        }
+        return null;
+    }
+
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/query/FlowRecordQuery.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/query/FlowRecordQuery.java
@@ -9,7 +9,19 @@
  */
 public interface FlowRecordQuery {
 
+    /**
+     * 根据ID获取流程记录
+     * @param id 流程记录ID
+     * @return 流程记录
+     */
+    FlowRecord getFlowRecordById(long id);
+
 
+    /**
+     * 查询所有流程记录
+     * @param pageRequest 分页参数
+     * @return 流程记录
+     */
     Page<FlowRecord> findAll(PageRequest pageRequest);
 
 
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.50</version>
+        <version>3.3.51</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
diff --git a/springboot-starter/src/main/resources/banner.txt b/springboot-starter/src/main/resources/banner.txt
@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 3.3.49
+CodingApi SpringBoot-Starter 3.3.51
 springboot version (${spring-boot.version})
 ------------------------------------------------------
