From bd47623b6833c86ef8af24657a246b6533210684 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Tue, 7 Mar 2023 20:11:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=80=99=E9=80=89=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/flow/Expression/index.vue    |  7 +++++--
 ruoyi-ui/src/components/flow/Role/index.vue     | 15 +++++++++------
 ruoyi-ui/src/components/flow/User/index.vue     | 17 ++++++++++-------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ruoyi-ui/src/components/flow/Expression/index.vue b/ruoyi-ui/src/components/flow/Expression/index.vue
index e3601bd2..5413766e 100755
--- a/ruoyi-ui/src/components/flow/Expression/index.vue
+++ b/ruoyi-ui/src/components/flow/Expression/index.vue
@@ -25,7 +25,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="expressionList" @current-change="handleSingleExpSelect">
+    <el-table v-loading="loading" :data="expressionList" row-key="id" @current-change="handleSingleExpSelect">
       <el-table-column  width="55" align="center" >
         <template slot-scope="scope">
           <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
@@ -51,6 +51,7 @@
 
 <script>
 import { listExpression } from "@/api/system/expression";
+import {StrUtil} from "@/utils/StrUtil";
 
 export default {
   name: "Expression",
@@ -98,7 +99,9 @@ export default {
   watch: {
     selectValues: {
       handler(newVal) {
-        this.radioSelected = newVal
+        if (StrUtil.isNotBlank(newVal)) {
+          this.radioSelected = newVal
+        }
       },
       immediate: true,
     }
diff --git a/ruoyi-ui/src/components/flow/Role/index.vue b/ruoyi-ui/src/components/flow/Role/index.vue
index 5eaf3b08..3c7ffd1d 100644
--- a/ruoyi-ui/src/components/flow/Role/index.vue
+++ b/ruoyi-ui/src/components/flow/Role/index.vue
@@ -60,6 +60,7 @@
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import {StrUtil} from "@/utils/StrUtil";
 
 export default {
   name: "FlowRole",
@@ -109,23 +110,25 @@ export default {
       // 表单参数
       form: {},
       radioSelected: null, // 单选框传值
-      selectRoleList: null // 回显数据传值
+      selectRoleList: [] // 回显数据传值
     };
   },
   watch: {
     selectValues: {
       handler(newVal) {
-        if (newVal instanceof Number || newVal instanceof String) {
-          this.radioSelected = newVal
-        } else {
-          this.selectRoleList = newVal;
+        if (StrUtil.isNotBlank(newVal)) {
+          if (newVal instanceof Number || newVal instanceof String) {
+            this.radioSelected = newVal
+          } else {
+            this.selectRoleList = newVal;
+          }
         }
       },
       immediate: true
     },
     roleList: {
       handler(newVal) {
-        if (newVal && this.selectRoleList) {
+        if (StrUtil.isNotBlank(newVal) && this.selectRoleList.length > 0) {
           this.$nextTick(() => {
             this.$refs.dataTable.clearSelection();
             this.selectRoleList?.split(',').forEach(key => {
diff --git a/ruoyi-ui/src/components/flow/User/index.vue b/ruoyi-ui/src/components/flow/User/index.vue
index c04d075b..2c4facf0 100644
--- a/ruoyi-ui/src/components/flow/User/index.vue
+++ b/ruoyi-ui/src/components/flow/User/index.vue
@@ -90,6 +90,7 @@
 import { listUser, deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {StrUtil} from "@/utils/StrUtil";
 
 export default {
   name: "FlowUser",
@@ -125,7 +126,7 @@ export default {
       // 总条数
       total: 0,
       // 用户表格数据
-      userList: null,
+      userList: [],
       // 弹出层标题
       title: "",
       // 部门树选项
@@ -160,7 +161,7 @@ export default {
         { key: 6, label: `创建时间`, visible: true }
       ],
       radioSelected: null, // 单选框传值
-      selectUserList: null // 回显数据传值
+      selectUserList: [] // 回显数据传值
     };
   },
   watch: {
@@ -170,17 +171,19 @@ export default {
     },
     selectValues: {
       handler(newVal) {
-        if (newVal instanceof Number) {
-          this.radioSelected = newVal
-        } else {
-          this.selectUserList = newVal;
+        if (StrUtil.isNotBlank(newVal)) {
+          if (newVal instanceof Number) {
+            this.radioSelected = newVal
+          } else {
+            this.selectUserList = newVal;
+          }
         }
       },
       immediate: true
     },
     userList: {
       handler(newVal) {
-        if (newVal && this.selectUserList) {
+        if (StrUtil.isNotBlank(newVal)  && this.selectUserList.length > 0) {
           this.$nextTick(() => {
             this.$refs.dataTable.clearSelection();
             this.selectUserList?.split(',').forEach(key => {