作者：张哲

时间：2023/05/06
类型：开发
描述：里程碑(1) 草稿不判断权限

.flattened-pom.xml

@@ -1,286 +1,285 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.redxun</groupId>
-        <artifactId>jpaas-cloud</artifactId>
-        <version>6.6.0-RELEASE</version>
-    </parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
     <groupId>com.redxun</groupId>
-    <artifactId>jpaas-knowledge</artifactId>
-    <version>6.6.1.7-E</version>
-    <description>knowledge应用</description>
-    <properties>
-        <docker.registry.url>192.168.1.236:86</docker.registry.url>
-        <jjwt.version>0.9.1</jjwt.version>
-        <aliyun-sdk-oss>3.4.2</aliyun-sdk-oss>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <velocity.version>1.7</velocity.version>
-        <commons-configuration.version>1.10</commons-configuration.version>
-        <easyCaptcha.version>1.6.2</easyCaptcha.version>
-        <docker.password>Jpaas2020</docker.password>
-        <swagger.butler.version>2.0.1</swagger.butler.version>
-        <poi.version>4.1.0</poi.version>
-        <swagger.mg.ui.version>1.0.6</swagger.mg.ui.version>
-        <docker.username>redxun</docker.username>
-        <fastjson.version>1.2.73</fastjson.version>
-        <seata.version>1.4.1.1</seata.version>
-        <jasypt.version>1.14</jasypt.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger.ui.version>1.9.3</swagger.ui.version>
-        <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
-        <hutool.version>4.6.1</hutool.version>
-        <spring-cloud-alibaba-dependencies.version>2.2.5.RELEASE</spring-cloud-alibaba-dependencies.version>
-        <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
-        <security-jwt.version>1.0.9.RELEASE</security-jwt.version>
-        <spring-cloud-dependencies.version>Hoxton.SR12</spring-cloud-dependencies.version>
-        <redisson.version>3.9.1</redisson.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <easypoi.version>4.1.0</easypoi.version>
-        <docker.plugin.version>1.4.13</docker.plugin.version>
-        <commons-io.version>2.6</commons-io.version>
-        <easyexcel.version>2.1.7</easyexcel.version>
-        <job.version>6.5.0.3</job.version>
-        <userAgent.version>1.21</userAgent.version>
-        <jpaas.version>6.6.1.7-E</jpaas.version>
-        <swagger.version>2.9.2</swagger.version>
-        <lettuce.version>5.2.2.RELEASE</lettuce.version>
-        <docker.namespace>jpaas</docker.namespace>
-        <fastdfs-client.version>1.26.5</fastdfs-client.version>
-        <commons-beanutils.version>1.9.4</commons-beanutils.version>
-        <msgsend.version>6.5.0.3</msgsend.version>
-        <java.version>8</java.version>
-        <commons-collections4.version>4.2</commons-collections4.version>
-        <banner.version>1.0.2</banner.version>
-        <spring-boot-admin.version>2.0.6</spring-boot-admin.version>
-        <spring-boot-maven-plugin.version>2.1.1.RELEASE</spring-boot-maven-plugin.version>
-        <mybatis.version>3.5.1</mybatis.version>
-        <transmittable.version>2.11.0</transmittable.version>
-        <qiniu-java-sdk>7.2.18</qiniu-java-sdk>
-        <spring-social-security.version>1.1.6.RELEASE</spring-social-security.version>
-        <sharding-sphere.version>3.1.0</sharding-sphere.version>
-        <security-oauth2.version>2.3.5.RELEASE</security-oauth2.version>
-        <servlet-api.version>4.0.1</servlet-api.version>
-        <spring-boot-dependencies.version>2.3.12.RELEASE</spring-boot-dependencies.version>
-        <revision>6.6.1.7-E</revision>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-common-cloud</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-common-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.10.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.csource</groupId>
-            <artifactId>fastdfs-client</artifactId>
-            <version>1.2.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>2.1.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-common-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-db-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
-            <version>2.1.0.1</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>log4j</artifactId>
-                    <groupId>log4j</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-cache-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-log-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-msgsend-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-idempotence-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-redis-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-swagger2-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-ribbon-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-web-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-job-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-common-tool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-common-dto</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-share</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jpaas-common-core</artifactId>
-                    <groupId>com.redxun</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jpaas-common-dto</artifactId>
-                    <groupId>com.redxun</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jpaas-db-spring-boot-starter</artifactId>
-                    <groupId>com.redxun</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>javase</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.activiti</groupId>
-            <artifactId>activiti-engine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.redxun</groupId>
-            <artifactId>jpaas-gencode-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.gexin.platform</groupId>
-            <artifactId>gexin-rp-fastjson</artifactId>
-            <version>1.0.0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.gexin.platform</groupId>
-            <artifactId>gexin-rp-sdk-http</artifactId>
-            <version>4.1.1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.gexin.platform</groupId>
-            <artifactId>gexin-rp-sdk-base</artifactId>
-            <version>4.0.0.38</version>
-        </dependency>
-        <dependency>
-            <groupId>com.gexin.platform</groupId>
-            <artifactId>gexin-rp-sdk-template</artifactId>
-            <version>4.0.0.31</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.7.0</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.plugin.version}</version>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <artifactId>jpaas-cloud</artifactId>
+    <version>6.6.0-RELEASE</version>
+  </parent>
+  <groupId>com.redxun</groupId>
+  <artifactId>jpaas-knowledge</artifactId>
+  <version>6.6.1.7-E</version>
+  <description>knowledge应用</description>
+  <properties>
+    <docker.registry.url>192.168.1.236:86</docker.registry.url>
+    <jjwt.version>0.9.1</jjwt.version>
+    <aliyun-sdk-oss>3.4.2</aliyun-sdk-oss>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <velocity.version>1.7</velocity.version>
+    <commons-configuration.version>1.10</commons-configuration.version>
+    <easyCaptcha.version>1.6.2</easyCaptcha.version>
+    <docker.password>Jpaas2020</docker.password>
+    <swagger.butler.version>2.0.1</swagger.butler.version>
+    <poi.version>4.1.0</poi.version>
+    <swagger.mg.ui.version>1.0.6</swagger.mg.ui.version>
+    <docker.username>redxun</docker.username>
+    <fastjson.version>1.2.73</fastjson.version>
+    <seata.version>1.4.1.1</seata.version>
+    <jasypt.version>1.14</jasypt.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <swagger.ui.version>1.9.3</swagger.ui.version>
+    <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
+    <hutool.version>4.6.1</hutool.version>
+    <spring-cloud-alibaba-dependencies.version>2.2.5.RELEASE</spring-cloud-alibaba-dependencies.version>
+    <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
+    <security-jwt.version>1.0.9.RELEASE</security-jwt.version>
+    <spring-cloud-dependencies.version>Hoxton.SR12</spring-cloud-dependencies.version>
+    <redisson.version>3.9.1</redisson.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <easypoi.version>4.1.0</easypoi.version>
+    <docker.plugin.version>1.4.13</docker.plugin.version>
+    <commons-io.version>2.6</commons-io.version>
+    <easyexcel.version>2.1.7</easyexcel.version>
+    <job.version>6.5.0.3</job.version>
+    <userAgent.version>1.21</userAgent.version>
+    <jpaas.version>6.6.1.7-E</jpaas.version>
+    <swagger.version>2.9.2</swagger.version>
+    <lettuce.version>5.2.2.RELEASE</lettuce.version>
+    <docker.namespace>jpaas</docker.namespace>
+    <fastdfs-client.version>1.26.5</fastdfs-client.version>
+    <commons-beanutils.version>1.9.4</commons-beanutils.version>
+    <msgsend.version>6.5.0.3</msgsend.version>
+    <java.version>8</java.version>
+    <commons-collections4.version>4.2</commons-collections4.version>
+    <banner.version>1.0.2</banner.version>
+    <spring-boot-admin.version>2.0.6</spring-boot-admin.version>
+    <spring-boot-maven-plugin.version>2.1.1.RELEASE</spring-boot-maven-plugin.version>
+    <mybatis.version>3.5.1</mybatis.version>
+    <transmittable.version>2.11.0</transmittable.version>
+    <qiniu-java-sdk>7.2.18</qiniu-java-sdk>
+    <spring-social-security.version>1.1.6.RELEASE</spring-social-security.version>
+    <sharding-sphere.version>3.1.0</sharding-sphere.version>
+    <security-oauth2.version>2.3.5.RELEASE</security-oauth2.version>
+    <servlet-api.version>4.0.1</servlet-api.version>
+    <spring-boot-dependencies.version>2.3.12.RELEASE</spring-boot-dependencies.version>
+    <revision>6.6.1.7-E</revision>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-common-cloud</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-common-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.aliyun.oss</groupId>
+      <artifactId>aliyun-sdk-oss</artifactId>
+      <version>3.10.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.csource</groupId>
+      <artifactId>fastdfs-client</artifactId>
+      <version>1.2.7</version>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba.cloud</groupId>
+      <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-freemarker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba</groupId>
+      <artifactId>fastjson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba</groupId>
+      <artifactId>easyexcel</artifactId>
+      <version>2.1.7</version>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-common-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-db-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.github.pagehelper</groupId>
+      <artifactId>pagehelper</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.owasp.esapi</groupId>
+      <artifactId>esapi</artifactId>
+      <version>2.1.0.1</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-cache-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-log-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-msgsend-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-idempotence-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-redis-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-swagger2-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-ribbon-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-web-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-job-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba.cloud</groupId>
+      <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-common-tool</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-common-dto</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-share</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>jpaas-common-core</artifactId>
+          <groupId>com.redxun</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jpaas-common-dto</artifactId>
+          <groupId>com.redxun</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jpaas-db-spring-boot-starter</artifactId>
+          <groupId>com.redxun</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.zxing</groupId>
+      <artifactId>core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.zxing</groupId>
+      <artifactId>javase</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.activiti</groupId>
+      <artifactId>activiti-engine</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.redxun</groupId>
+      <artifactId>jpaas-gencode-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.gexin.platform</groupId>
+      <artifactId>gexin-rp-fastjson</artifactId>
+      <version>1.0.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>com.gexin.platform</groupId>
+      <artifactId>gexin-rp-sdk-http</artifactId>
+      <version>4.1.1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>com.gexin.platform</groupId>
+      <artifactId>gexin-rp-sdk-base</artifactId>
+      <version>4.0.0.38</version>
+    </dependency>
+    <dependency>
+      <groupId>com.gexin.platform</groupId>
+      <artifactId>gexin-rp-sdk-template</artifactId>
+      <version>4.0.0.31</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${spring-boot-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.spotify</groupId>
+        <artifactId>dockerfile-maven-plugin</artifactId>
+        <version>${docker.plugin.version}</version>
+        <configuration>
+          <username>${docker.username}</username>
+          <password>${docker.password}</password>
+          <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+          <tag>${project.version}</tag>
+          <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+          <buildArgs>
+            <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+          </buildArgs>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

src/main/java/com/redxun/knowledge/entity/vo/KnowledgeApprovalNodeFlowerVo.java

@@ -23,5 +23,7 @@ public class KnowledgeApprovalNodeFlowerVo implements Serializable {
 
     private List<String> category;
 
+    private List<String> categoryName;
+
     private List<KnowledgeApprovalNodeVo> knowledgeApprovalNode;
 }

src/main/java/com/redxun/knowledge/service/KnowledgeApprovalNodeServiceImpl.java

@@ -151,6 +151,9 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
     public List<KnowledgeApprovalNodeFlowerVo> findAllNodes() {
         List<KnowledgeApprovalNodeFlowerVo> result = knowledgeApprovalNodeFlowerMapper.findAllNodes();
         result.forEach(e -> {
+            if (flowerName.equals(e.getFlowerName())){
+                e.setCategory(new ArrayList<>());
+            }
             List<String> category = new ArrayList<>();
             e.getCategory().forEach(h -> {
                 KnowledgeCategory knowledgeCategory = knowledgeCategoryMapper.selectById(h);
@@ -158,7 +161,7 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
                     category.add(knowledgeCategory.getName());
                 }
             });
-            e.setCategory(category);
+            e.setCategoryName(category);
         });
         return result;
     }

src/main/java/com/redxun/knowledge/service/KnowledgeServiceImpl.java

@@ -128,8 +128,13 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
             knowledge.setAttachment(knowledgeDto.getAttachment());
             knowledge.setAttachmentName(knowledgeDto.getAttachmentName());
             knowledge.setAttachmentType(knowledgeDto.getAttachmentType());
-            knowledge.setApprovalStatus(1);
-            knowledge.setApprovalBatch(1);
+            if (knowledgeDto.getIsDraft() == 0){
+                knowledge.setApprovalStatus(6);
+                knowledge.setApprovalBatch(0);
+            } else {
+                knowledge.setApprovalStatus(1);
+                knowledge.setApprovalBatch(1);
+            }
             knowledge.setContent(knowledgeDto.getContent());
             IUser users = ContextUtil.getCurrentUser();
             knowledge.setCreateDepId(users.getDeptId());
@@ -217,6 +222,29 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
         if (knowledge == null) {
             return null;
         }
+
+        KnowledgeVo knowledgeVo = new KnowledgeVo();
+        if (knowledge != null) {
+            knowledgeVo.setPkId(knowledge.getPkId());
+            knowledgeVo.setCategoryId(knowledge.getCategoryId());
+            knowledgeVo.setType(knowledge.getType());
+            knowledgeVo.setTitles(knowledge.getTitles());
+            knowledgeVo.setAuthor(knowledge.getAuthor());
+            knowledgeVo.setContent(knowledge.getContent());
+            knowledgeVo.setSummary(knowledge.getSummary());
+            knowledgeVo.setAttachment(knowledge.getAttachment());
+            knowledgeVo.setAttachmentName(knowledge.getAttachmentName());
+            knowledgeVo.setCreateTime(knowledge.getCreateTime());
+            knowledgeVo.setApprovalStatus(knowledge.getApprovalStatus());
+            knowledgeVo.setCreateBy(knowledge.getCreateBy());
+            knowledgeVo.setViews(knowledge.getViews());
+            knowledgeVo.setOrganizationId(knowledge.getOrganizationId());
+            knowledgeVo.setKnowledgeCategoryAdminVo(knowledgeCategoryService.findAllParentByCategoryId(knowledge.getCategoryId()));
+            if (knowledge.getIsDraft() == 0){
+                return knowledgeVo;
+            }
+        }
+
         List<KnowledgeApprove> approvalVoList = knowledgeApproveMapper.selectList(new QueryWrapper<KnowledgeApprove>().eq("KNOWLEDGER_ID", pkId).orderByAsc("SORT"));
         List<KnowledgeApprovalVo> approvals = new ArrayList<>();
         // 审核节点
@@ -257,25 +285,8 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
                 approvals.add(approvalVo);
             }
         }
-        KnowledgeVo knowledgeVo = new KnowledgeVo();
-        if (knowledge != null) {
-            knowledgeVo.setPkId(knowledge.getPkId());
-            knowledgeVo.setCategoryId(knowledge.getCategoryId());
-            knowledgeVo.setType(knowledge.getType());
-            knowledgeVo.setTitles(knowledge.getTitles());
-            knowledgeVo.setAuthor(knowledge.getAuthor());
-            knowledgeVo.setContent(knowledge.getContent());
-            knowledgeVo.setSummary(knowledge.getSummary());
-            knowledgeVo.setAttachment(knowledge.getAttachment());
-            knowledgeVo.setAttachmentName(knowledge.getAttachmentName());
-            knowledgeVo.setCreateTime(knowledge.getCreateTime());
-            knowledgeVo.setApprovalStatus(knowledge.getApprovalStatus());
-            knowledgeVo.setCreateBy(knowledge.getCreateBy());
-            knowledgeVo.setApprovals(approvals);
-            knowledgeVo.setViews(knowledge.getViews());
-            knowledgeVo.setOrganizationId(knowledge.getOrganizationId());
-            knowledgeVo.setKnowledgeCategoryAdminVo(knowledgeCategoryService.findAllParentByCategoryId(knowledge.getCategoryId()));
-        }
+        knowledgeVo.setApprovals(approvals);
+
         if (flag != null && flag == 1) {
             // 解析组织架构/职系/职等数据
             Map<String, Object> organizationIdMap = new HashMap<>();