From ca2576456908045ca97c5b7d658279060030fa63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 1 Jul 2025 18:00:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-bigscreen/src/views/quality/qualityCheck.vue             | 2 +-
 .../main/resources/mapper/flowable/FlowBusinessKeyMapper.xml    | 2 +-
 .../src/views/trouble/problemmodifyDraftQuality/index.vue       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yanzhu-bigscreen/src/views/quality/qualityCheck.vue b/yanzhu-bigscreen/src/views/quality/qualityCheck.vue
index 6c6379f6..3e37a534 100644
--- a/yanzhu-bigscreen/src/views/quality/qualityCheck.vue
+++ b/yanzhu-bigscreen/src/views/quality/qualityCheck.vue
@@ -374,7 +374,7 @@ export default {
                         data: it,
                     }
                 })
-                this.chart2Data = (res[1].data || []).map((it) => {
+                this.chart2Data = (res[1].data.fi || []).map((it) => {
                     return {
                         id: it.nickedInfo,
                         name: it.dangerType,
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
index 0bd8c28f..a74e36f8 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
@@ -58,7 +58,7 @@
         <if test='activeTags == "users"'>, bus.user_picture as businessImg, bus.card_code as businessMk1, sdd.dict_label as businessMk2, bus.sub_dept_name as businessMk3</if>
         from vw_flow_await fa
         <if test='activeTags == "depts"'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join pro_project_info_subdepts sud on sud.id = bus.sub_dept_id left join sys_dict_data sdd on sdd.dict_value = bus.sub_dept_type and sdd.dict_type='sub_dept_type' </if>
-        <if test='activeTags == "users"'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join sys_dict_data sdd on sdd.dict_value = bus.craft_post and sdd.dict_type='pro_craft_post'</if>
+        <if test='activeTags == "users" or (groupIds != null and groupIds.size()>0)'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join sys_dict_data sdd on sdd.dict_value = bus.craft_post and sdd.dict_type='pro_craft_post'</if>
         where
             fa.taskName != '申请人提交'
             <if test="procDefName != null  and procDefName != ''"> and fa.procDefName like concat('%', #{procDefName}, '%')</if>
diff --git a/yanzhu-ui-vue3/src/views/trouble/problemmodifyDraftQuality/index.vue b/yanzhu-ui-vue3/src/views/trouble/problemmodifyDraftQuality/index.vue
index 81b9b235..a025b8a6 100644
--- a/yanzhu-ui-vue3/src/views/trouble/problemmodifyDraftQuality/index.vue
+++ b/yanzhu-ui-vue3/src/views/trouble/problemmodifyDraftQuality/index.vue
@@ -350,7 +350,7 @@ function doBatchAdd(datas) {
     datas.forEach((it) => {
         it.projectId = userStore.currentPrjId
         it.comId = userStore.currentComId
-        it.infoType = 0
+        it.infoType = 1
         let users = data.users.filter((u) => u.userId == it.lordSent)
         it.lordSent = users.map((u) => u.userId).join(',')
         it.lordSentUser = users.map((u) => u.userName).join(',')