From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面:月度统计时间调整为上月26到本月25;班次支持右键添加批注 2.外购下单:KJNS域订单免检自动更新批次属性;外购下单-全部页新增【更新IFS批次属性】按钮,支持更新已提交订单的批次属性 3.资源要求-设备:设备核查计划:核查负责人回显问题修复;设备使用授权:检验项目导出数据错误问题修复

---
 cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml
index 96e0358..a4d9133 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml
@@ -16,10 +16,10 @@
         -- 鍙栧矖浣�
         left join cnas_person_basic_info cpbi on cpbi.user_id = cppc.user_id
         -- 鍙栦汉鍛樿兘鍔涚殑宀椾綅鑱岃矗
-        left join (SELECT GROUP_CONCAT(e.label) responsibilities, cppc.id
+        left join (SELECT GROUP_CONCAT(e.dict_label) responsibilities, cppc.id
         from cnas_person_personnel_capacity cppc
-        left join enums e on FIND_IN_SET(e.value, cppc.job_responsibilities)
-        where e.category = '宀椾綅鑱岃矗'
+        left join sys_dict_data e on FIND_IN_SET(e.dict_value, cppc.job_responsibilities)
+        where e.dict_type = 'responsibilities_list'
         GROUP BY cppc.id) ecp on ecp.id = cppc.id
         <where>
             <if test="userId != null and userId != ''">

--
Gitblit v1.9.3