Merge remote-tracking branch 'origin/master' into master

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -326,38 +326,42 @@
 
     <select id="lazyTree" resultMap="treeNodeResultMap">
         SELECT
-        d.p_key_id as "primaryKeyId",
-        d.type AS "type",
-        d.table_type,
-        d.id,
-        d.parent_id,
-        d.node_name AS title,
-        d.node_type AS "nodeType",
-        d.id AS "value",
-        d.id AS "key",
-        d.major_data_type AS "majorDataType",
-        d.is_exist_form AS "isExistForm",
-        d.mix_ratio_test_ids AS "mixRatioTestIds",
-        (
-        SELECT
-        CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+            d.p_key_id as "primaryKeyId",
+            d.type AS "type",
+            d.table_type,
+            d.id,
+            d.parent_id,
+            CASE
+                WHEN d.parent_id = 0 THEN
+                    (SELECT project_alias FROM m_project_info WHERE id = #{projectId})
+                ELSE d.node_name
+            END AS title,
+            d.node_type AS "nodeType",
+            d.id AS "value",
+            d.id AS "key",
+            d.major_data_type AS "majorDataType",
+            d.is_exist_form AS "isExistForm",
+            d.mix_ratio_test_ids AS "mixRatioTestIds",
+            (
+                SELECT
+                CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+                FROM
+                m_wbs_tree_private
+                WHERE
+                parent_id = d.id and is_deleted = 0 and type != 2
+            ) AS "has_children"
         FROM
-        m_wbs_tree_private
+            m_wbs_tree_private d
         WHERE
-        parent_id = d.id and is_deleted = 0 and type != 2
-        ) AS "has_children"
-        FROM
-        m_wbs_tree_private d
-        WHERE
-        d.is_deleted = 0
+            d.is_deleted = 0
         AND d.parent_id = #{parentId}
         AND d.project_id = #{projectId}
-        <if test="wbsType != null and wbsType != '' and wbsType != -1">
-            AND d.wbs_type = #{wbsType}
-        </if>
-        <if test="wbsId != null and wbsId != '' and wbsType !=-1">
-            AND d.wbs_id = #{wbsId}
-        </if>
+            <if test="wbsType != null and wbsType != '' and wbsType != -1">
+                AND d.wbs_type = #{wbsType}
+            </if>
+            <if test="wbsId != null and wbsId != '' and wbsType !=-1">
+                AND d.wbs_id = #{wbsId}
+            </if>
         AND d.type = 1
         AND status = 1
         ORDER BY d.sort

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -1354,9 +1354,13 @@ public class TaskController extends BladeController {
         if (ObjectUtil.isEmpty(dto.getTaskId())) {
             throw new ServiceException("未获取到taskId");
         }
-        String sql = "SELECT meter_task_type,form_data_id,process_instance_id,contract_id,project_id FROM u_task WHERE id = ?";
+        String sql = "SELECT meter_task_type,form_data_id,process_instance_id,contract_id,project_id,status FROM u_task WHERE id = ?";
         Task task = jdbcTemplate.query(sql, new Object[]{dto.getTaskId()}, new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
         if (task != null) {
+            if (task.getStatus().equals(2)) {
+                throw new ServiceException("已审批任务无法删除，操作失败");
+            }
+
             check(task);
 
             if (task.getMeterTaskType().equals(1)) {