Procházet zdrojové kódy

降低activiti版本

赵冬冬 před 3 roky
rodič
revize
628ae25293

+ 4 - 22
pom.xml

@@ -33,6 +33,8 @@
         <jwt.version>0.9.0</jwt.version>
         <swagger.version>2.9.2</swagger.version>
         <oshi.version>3.9.1</oshi.version>
+        <activiti.version>5.22.0</activiti.version>
+
     </properties>
 
     <dependencies>
@@ -41,14 +43,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <!--
-             <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
-             -->
         </dependency>
 
         <!-- SpringBoot 测试 -->
@@ -228,25 +222,13 @@
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-spring-boot-starter-basic</artifactId>
-            <version>6.0.0</version>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>activiti-image-generator</artifactId>-->
-<!--                    <groupId>org.activiti</groupId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
+            <version>${activiti.version}</version>
         </dependency>
         <!--模型设计-->
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-json-converter</artifactId>
-            <version>5.22.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.activiti</groupId>
-                    <artifactId>activiti-bpmn-model</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>${activiti.version}</version>
         </dependency>
         <!-- JSON工具类 -->
         <dependency>

+ 1 - 1
src/main/java/com/ruoyi/project/activiti/controller/LeaveNewController.java

@@ -69,7 +69,7 @@ public class LeaveNewController extends BaseController {
         }
         ;
         myFormDataActiviti.setApplyUser(userId.toString());
-        myFormDataActiviti.setCreateUser(user.getNickName());
+        myFormDataActiviti.setCreateUser(user.getUserName());
         myFormDataActiviti.setCreateDept(user.getDept().getDeptName());
         myFormDataActiviti.setCreateBy(userId.toString());
         myFormDataActiviti.setCreateTime(new Date());

+ 5 - 1
src/main/java/com/ruoyi/project/activiti/domain/MyTask.java

@@ -162,7 +162,6 @@ public class MyTask implements Task {
         this.priority = priority;
     }
 
-    @Override
     public Date getClaimTime() {
         return claimTime;
     }
@@ -227,6 +226,11 @@ public class MyTask implements Task {
         this.category = category;
     }
 
+    @Override
+    public void delegate(String userId) {
+
+    }
+
     private String description;
 
     private String processDefinitionId;

+ 1 - 0
src/main/java/com/ruoyi/project/activiti/service/impl/LeaveNewServiceImpl.java

@@ -241,6 +241,7 @@ public class LeaveNewServiceImpl implements LeaveNewService {
             String[] split = processDefinitionId.split(":");
             String businessKey = split[0];
             Integer version = Integer.valueOf(split[1]);
+            myTaskVo.setProcessDefinitionId(processDefinitionId);
             myTaskVo.setTaskId(id);
             myTaskVo.setTaskName(name);
             myTaskVo.setFormKey(formKey);