Browse Source

作者:张哲
时间:2023/05/11
类型:优化
描述:里程碑(1) 排序修改

zizg 2 years ago
parent
commit
70e27279cf

+ 5 - 1
src/main/java/com/redxun/knowledge/controller/KnowledgeController.java

@@ -92,7 +92,11 @@ public class KnowledgeController extends BaseController<Knowledge> {
         if (update == -1) {
             return JsonResult.Success("知识正在审核中,无法修改");
         } else {
-            return JsonResult.getSuccessResult("修改知识成功!");
+            if (entity.getIsDraft() != null && entity.getIsDraft() == 0) {
+                return JsonResult.getSuccessResult("知识暂存成功!");
+            } else {
+                return JsonResult.getSuccessResult("修改知识成功!");
+            }
         }
     }
 

+ 2 - 2
src/main/resources/mapper/knowledge/KnowledgeApprovalNodeFlowerMapper.xml

@@ -52,14 +52,14 @@
                node.NAME    name,
                node.APPROVER_NAME approverName,
                node.IS_FINAL isFinal,
-               node.APPROVER_ID approverId
+               node.APPROVER_ID approverId,
                category.CATEGORY_ID as categoryId
         from KM_KNOWLEDGE_APPROVAL_NODE_FLOWER flower
                  left join KM_KNOWLEDGE_APPROVAL_NODE node
                            on flower.PK_ID = node.FLOWER_ID and node.IS_DEL = 0
                  left join KM_KNOWLEDGE_APPROVAL_NODE_CATEGORY category on flower.PK_ID = category.FLOWER_ID and category.IS_DEL = 0
        where flower.IS_DEL = 0
-       order by node.IS_FINAL,node.CREATE_TIME_,flower.CREATE_TIME_
+       order by flower.CREATE_TIME_,node.IS_FINAL,node.CREATE_TIME_
     </select>
 
     <select id="findAllNodesByCategoryId" resultType="com.redxun.knowledge.entity.vo.KnowledgeApprovalNodeVo">