From d4cbd437f74a98ef51b0326afaaecce3ec288f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 24 Feb 2022 20:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=8B=A5=E6=9C=AA=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E5=88=B0=E5=AD=97=E5=85=B8=E6=A0=87=E7=AD=BE=E5=88=99?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8E=9F=E5=AD=97=E5=85=B8=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/utils/ruoyi.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/ZR.Vue/src/utils/ruoyi.js b/ZR.Vue/src/utils/ruoyi.js
index 4e4f5aa..55ad82a 100644
--- a/ZR.Vue/src/utils/ruoyi.js
+++ b/ZR.Vue/src/utils/ruoyi.js
@@ -99,6 +99,9 @@ export function addDateRange2(dateRange, index) {
 
 // 回显数据字典
 export function selectDictLabel(datas, value) {
+  if (value === undefined) {
+    return "";
+  }
   var actions = [];
   Object.keys(datas).some((key) => {
     if (datas[key].dictValue == ('' + value)) {
@@ -106,6 +109,9 @@ export function selectDictLabel(datas, value) {
       return true;
     }
   })
+  if (actions.length === 0) {
+    actions.push(value);
+  }
   return actions.join('');
 }
 
@@ -118,11 +124,16 @@ export function selectDictLabels(datas, value, separator) {
   var currentSeparator = undefined === separator ? "," : separator;
   var temp = value.split(currentSeparator);
   Object.keys(value.split(currentSeparator)).some((val) => {
+    var match = false;
     Object.keys(datas).some((key) => {
-      if (datas[key].dictValue == ('' + temp[val])) {
-        actions.push(datas[key].dictLabel + currentSeparator);
+      if (datas[key].value == ('' + temp[val])) {
+        actions.push(datas[key].label + currentSeparator);
+        match = true;
       }
     })
+    if (!match) {
+      actions.push(temp[val] + currentSeparator);
+    }
   })
   return actions.join('').substring(0, actions.join('').length - 1);
 }