From 7c0519888a643c0f092c7c1acc4eb2b58ced6223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Fri, 4 Feb 2022 17:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=8A=A0=E2=80=9C=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E2=80=9D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/magic-api/api/后台/用户管理/列表.ms      | 84 ++++++++++++++++++-
 magic-boot-ui/src/assets/magic-boot.svg       |  1 -
 .../src/components/MagicBoot/mb-search.vue    |  4 +-
 .../src/components/MagicBoot/mb-select.vue    |  8 +-
 .../src/components/MagicBoot/mb-table.vue     |  2 +-
 .../src/views/system/role/role-list.vue       | 12 +--
 .../src/views/system/user/user-form.vue       |  4 +-
 .../src/views/system/user/user-list.vue       | 15 ++++
 8 files changed, 112 insertions(+), 18 deletions(-)
 delete mode 100644 magic-boot-ui/src/assets/magic-boot.svg

diff --git a/data/magic-api/api/后台/用户管理/列表.ms b/data/magic-api/api/后台/用户管理/列表.ms
index 6a766d3..b854663 100644
--- a/data/magic-api/api/后台/用户管理/列表.ms
+++ b/data/magic-api/api/后台/用户管理/列表.ms
@@ -5,7 +5,7 @@
   "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a",
   "name" : "列表",
   "createTime" : null,
-  "updateTime" : 1642173275899,
+  "updateTime" : 1643965494984,
   "lock" : "0",
   "method" : "GET",
   "path" : "/list",
@@ -14,15 +14,88 @@
   "requestBody" : "",
   "headers" : [ ],
   "paths" : [ ],
-  "responseBody" : null,
+  "responseBody" : "{\n    \"code\": 402,\n    \"message\": \"凭证已过期\",\n    \"data\": null,\n    \"timestamp\": 1643964929030,\n    \"executeTime\": null\n}",
   "description" : null,
   "requestBodyDefinition" : null,
-  "responseBodyDefinition" : null,
+  "responseBodyDefinition" : {
+    "name" : "",
+    "value" : "",
+    "description" : "",
+    "required" : false,
+    "dataType" : "Object",
+    "type" : null,
+    "defaultValue" : null,
+    "validateType" : "",
+    "error" : "",
+    "expression" : "",
+    "children" : [ {
+      "name" : "code",
+      "value" : "402",
+      "description" : "",
+      "required" : false,
+      "dataType" : "Integer",
+      "type" : null,
+      "defaultValue" : null,
+      "validateType" : "",
+      "error" : "",
+      "expression" : "",
+      "children" : [ ]
+    }, {
+      "name" : "message",
+      "value" : "凭证已过期",
+      "description" : "",
+      "required" : false,
+      "dataType" : "String",
+      "type" : null,
+      "defaultValue" : null,
+      "validateType" : "",
+      "error" : "",
+      "expression" : "",
+      "children" : [ ]
+    }, {
+      "name" : "data",
+      "value" : "null",
+      "description" : "",
+      "required" : false,
+      "dataType" : "Object",
+      "type" : null,
+      "defaultValue" : null,
+      "validateType" : "",
+      "error" : "",
+      "expression" : "",
+      "children" : [ ]
+    }, {
+      "name" : "timestamp",
+      "value" : "1643964929030",
+      "description" : "",
+      "required" : false,
+      "dataType" : "Long",
+      "type" : null,
+      "defaultValue" : null,
+      "validateType" : "",
+      "error" : "",
+      "expression" : "",
+      "children" : [ ]
+    }, {
+      "name" : "executeTime",
+      "value" : "null",
+      "description" : "",
+      "required" : false,
+      "dataType" : "Object",
+      "type" : null,
+      "defaultValue" : null,
+      "validateType" : "",
+      "error" : "",
+      "expression" : "",
+      "children" : [ ]
+    } ]
+  },
   "optionMap" : { }
 }
 ================================
 return db.page("""
     select
+        distinct
         su.id,
         su.username,
         su.name,
@@ -30,10 +103,13 @@ return db.page("""
         su.phone,
         su.create_date,
         su.office_id,
-        so.name office_name
+        so.name office_name,
+        (select group_concat(sr.name) from sys_role sr left join sys_user_role sur on sr.id = sur.role_id where sr.is_del = 0 and sur.user_id = su.id) roles
     from sys_user su
     left join sys_office so on su.office_id = so.id
+    left join sys_user_role sur on su.id = sur.user_id
     where su.is_del = 0
+    ?{roleId, and sur.role_id in(#{roleId.split(',')})}
     ?{officeId, and su.office_id in(#{officeId.split(',')})}
     ?{username, and su.username like concat('%',#{username},'%')}
     ?{name, and su.name like concat('%',#{name},'%')}
diff --git a/magic-boot-ui/src/assets/magic-boot.svg b/magic-boot-ui/src/assets/magic-boot.svg
deleted file mode 100644
index d09e350..0000000
--- a/magic-boot-ui/src/assets/magic-boot.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="398.088" height="79.2"><path fill="white" stroke="white" d="M49.32 30.02L49.32 30.02Q48.74 31.75 47.84 34.52Q46.94 37.30 45.86 40.61Q44.78 43.92 43.63 47.63Q42.48 51.34 41.29 54.86Q40.10 58.39 38.95 61.60Q37.80 64.80 36.86 67.18L36.86 67.18Q36.58 67.75 35.68 68.08Q34.78 68.40 32.83 68.40L32.83 68.40Q31.61 68.40 30.31 68.26Q29.02 68.11 27.90 67.68Q26.78 67.25 25.96 66.53Q25.13 65.81 24.70 64.73L24.70 64.73Q23.62 61.06 22.64 56.56Q21.67 52.06 20.74 47.38Q19.80 42.70 18.90 38.20Q18.00 33.70 17.06 30.02L17.06 30.02Q17.06 31.03 16.99 33.48Q16.92 35.93 16.85 39.17Q16.78 42.41 16.67 46.15Q16.56 49.90 16.49 53.46Q16.42 57.02 16.34 60.08Q16.27 63.14 16.27 65.09L16.27 65.09Q16.27 67.25 16.02 67.82Q15.77 68.40 15.12 68.40L15.12 68.40L11.16 68.40Q7.06 68.40 5.36 66.78Q3.67 65.16 3.67 61.99L3.67 61.99Q3.67 61.13 3.78 59.08Q3.89 57.02 4.10 54.22Q4.32 51.41 4.57 48.06Q4.82 44.71 5.11 41.26L5.11 41.26Q5.47 36.58 5.72 33.44Q5.98 30.31 6.12 28.22Q6.26 26.14 6.37 24.84Q6.48 23.54 6.52 22.54Q6.55 21.53 6.59 20.63Q6.62 19.73 6.62 18.36L6.62 18.36Q6.62 17.78 7.06 17.53Q7.49 17.28 7.85 17.28L7.85 17.28L17.93 17.28Q20.74 17.28 22.54 18.18Q24.34 19.08 25.49 20.95Q26.64 22.82 27.36 25.81Q28.08 28.80 28.69 32.90Q29.30 37.01 30.06 42.37Q30.82 47.74 32.04 54.43L32.04 54.43Q33.19 49.97 33.98 47.02Q34.78 44.06 35.32 42.08Q35.86 40.10 36.22 38.81Q36.58 37.51 36.86 36.40Q37.15 35.28 37.51 33.98Q37.87 32.69 38.38 30.74Q38.88 28.80 39.64 25.88Q40.39 22.97 41.54 18.50L41.54 18.50Q41.69 18.07 42.05 17.68Q42.41 17.28 43.34 17.28L43.34 17.28L54.58 17.28Q56.88 17.28 58.28 17.75Q59.69 18.22 60.48 19.08Q61.27 19.94 61.56 21.20Q61.85 22.46 61.85 24.12L61.85 24.12Q61.85 25.78 61.67 29.48Q61.49 33.19 61.16 37.84Q60.84 42.48 60.52 47.45Q60.19 52.42 59.87 56.66Q59.54 60.91 59.33 63.86Q59.11 66.82 59.04 67.32L59.04 67.32Q58.97 67.90 58.75 68.15Q58.54 68.40 57.89 68.40L57.89 68.40L53.93 68.40Q49.82 68.40 48.13 66.78Q46.44 65.16 46.44 62.57L46.44 62.57Q46.44 61.78 46.62 59.69Q46.80 57.60 47.09 54.79Q47.38 51.98 47.74 48.64Q48.10 45.29 48.38 41.98Q48.67 38.66 48.92 35.53Q49.18 32.40 49.32 30.02ZM66.17 59.54L66.17 59.54Q66.17 53.06 72 49.39Q77.83 45.72 89.21 45.43L89.21 45.43Q89.28 44.64 89.32 44.10Q89.35 43.56 89.35 42.77L89.35 42.77Q89.35 40.46 88.49 39.10Q87.62 37.73 84.89 37.73L84.89 37.73Q83.38 37.73 82.44 38.16Q81.50 38.59 80.93 39.35Q80.35 40.10 79.99 41.18Q79.63 42.26 79.34 43.56L79.34 43.56Q79.20 44.21 78.70 44.39Q78.19 44.57 77.11 44.57L77.11 44.57Q69.77 44.57 69.77 39.02L69.77 39.02Q69.77 36.79 70.81 34.78Q71.86 32.76 73.91 31.28Q75.96 29.81 79.06 28.94Q82.15 28.08 86.26 28.08L86.26 28.08Q94.25 28.08 97.85 31.39Q101.45 34.70 101.45 40.75L101.45 40.75Q101.45 41.54 101.27 43.60Q101.09 45.65 100.84 47.92Q100.58 50.18 100.40 52.20Q100.22 54.22 100.22 55.01L100.22 55.01Q100.22 56.81 100.87 57.56Q101.52 58.32 102.35 58.61Q103.18 58.90 103.82 59.04Q104.47 59.18 104.47 59.76L104.47 59.76Q104.47 61.34 104.04 63.00Q103.61 64.66 102.64 66.02Q101.66 67.39 99.97 68.26Q98.28 69.12 95.83 69.12L95.83 69.12Q92.38 69.12 90.65 67.46Q88.92 65.81 88.34 62.86L88.34 62.86Q86.62 65.38 83.84 67.25Q81.07 69.12 76.61 69.12L76.61 69.12Q74.45 69.12 72.54 68.62Q70.63 68.11 69.23 66.96Q67.82 65.81 67.00 63.97Q66.17 62.14 66.17 59.54ZM88.56 51.34L88.56 51.34Q86.69 51.34 84.89 51.62Q83.09 51.91 81.68 52.52Q80.28 53.14 79.42 54.14Q78.55 55.15 78.55 56.59L78.55 56.59Q78.55 58.25 79.60 58.90Q80.64 59.54 81.86 59.54L81.86 59.54Q83.02 59.54 84.17 59.04Q85.32 58.54 86.22 57.49Q87.12 56.45 87.77 54.94Q88.42 53.42 88.56 51.34ZM132.41 59.90L132.41 59.90Q130.61 63.14 128.02 64.69Q125.42 66.24 121.54 66.24L121.54 66.24Q118.58 66.24 116.14 65.30Q113.69 64.37 111.96 62.35Q110.23 60.34 109.26 57.28Q108.29 54.22 108.29 49.97L108.29 49.97Q108.29 46.51 109.01 42.66Q109.73 38.81 111.64 35.57Q113.54 32.33 116.86 30.20Q120.17 28.08 125.35 28.08L125.35 28.08Q127.51 28.08 129.06 28.55Q130.61 29.02 131.72 29.81Q132.84 30.60 133.52 31.68Q134.21 32.76 134.57 33.98L134.57 33.98Q134.57 34.06 134.60 33.44Q134.64 32.83 134.71 32.04Q134.78 31.25 134.82 30.49Q134.86 29.74 134.86 29.52L134.86 29.52Q134.93 28.80 135.79 28.80L135.79 28.80L139.10 28.80Q142.85 28.80 144.54 30.35Q146.23 31.90 146.23 36.22L146.23 36.22Q146.23 36.79 146.16 38.84Q146.09 40.90 145.91 43.78Q145.73 46.66 145.44 50.15Q145.15 53.64 144.79 57.17Q144.43 60.70 144 63.94Q143.57 67.18 143.06 69.62L143.06 69.62Q142.56 72.07 141.34 74.38Q140.11 76.68 137.88 78.48Q135.65 80.28 132.16 81.36Q128.66 82.44 123.62 82.44L123.62 82.44Q119.81 82.44 116.96 81.72Q114.12 81 112.25 79.81Q110.38 78.62 109.40 77.11Q108.43 75.60 108.43 74.09L108.43 74.09Q108.43 72.72 109.01 71.71Q109.58 70.70 110.52 70.06Q111.46 69.41 112.57 69.08Q113.69 68.76 114.70 68.76L114.70 68.76Q115.92 68.76 116.50 69.48Q117.07 70.20 117.79 71.10Q118.51 72 119.81 72.72Q121.10 73.44 123.84 73.44L123.84 73.44Q128.59 73.44 130.50 69.95Q132.41 66.46 132.41 59.90ZM126.36 56.66L126.36 56.66Q128.95 56.66 130.43 55.44Q131.90 54.22 132.70 52.49Q133.49 50.76 133.70 48.89Q133.92 47.02 133.92 45.65L133.92 45.65Q133.92 41.33 132.59 39.49Q131.26 37.66 128.59 37.66L128.59 37.66Q125.93 37.66 124.42 39.10Q122.90 40.54 122.15 42.52Q121.39 44.50 121.18 46.48Q120.96 48.46 120.96 49.54L120.96 49.54Q120.96 53.14 122.18 54.90Q123.41 56.66 126.36 56.66ZM162.58 68.40L159.98 68.40Q157.75 68.40 156.35 67.93Q154.94 67.46 154.12 66.60Q153.29 65.74 152.96 64.48Q152.64 63.22 152.64 61.56L152.64 61.56Q152.64 60.48 152.75 58.50Q152.86 56.52 153.14 53.03Q153.43 49.54 153.83 44.17Q154.22 38.81 154.80 30.89L154.80 30.89Q154.87 29.30 155.16 29.02L155.16 29.02Q155.38 28.80 156.31 28.80L156.31 28.80L159.12 28.80Q161.35 28.80 162.76 29.23Q164.16 29.66 164.99 30.53Q165.82 31.39 166.14 32.62Q166.46 33.84 166.46 35.35L166.46 35.35Q166.46 36.43 166.32 38.59Q166.18 40.75 165.92 44.46Q165.67 48.17 165.24 53.68Q164.81 59.18 164.16 66.96L164.16 66.96Q164.09 67.82 163.80 68.11Q163.51 68.40 162.58 68.40L162.58 68.40ZM154.87 20.30L154.87 20.30Q154.87 17.42 156.96 15.77Q159.05 14.11 162.58 14.11L162.58 14.11Q165.67 14.11 167.08 15.37Q168.48 16.63 168.48 18.72L168.48 18.72Q168.48 21.38 166.50 23.15Q164.52 24.91 160.70 24.91L160.70 24.91Q154.87 24.91 154.87 20.30ZM190.94 59.54L190.94 59.54Q193.03 59.54 194.58 58.97Q196.13 58.39 197.28 57.67Q198.43 56.95 199.22 56.38Q200.02 55.80 200.66 55.80L200.66 55.80Q202.32 55.80 202.32 57.96L202.32 57.96Q202.32 58.46 202.10 59.36Q201.89 60.26 201.53 61.24Q201.17 62.21 200.77 63.07Q200.38 63.94 200.02 64.37L200.02 64.37Q199.66 64.73 198.76 65.52Q197.86 66.31 196.34 67.10Q194.83 67.90 192.82 68.51Q190.80 69.12 188.35 69.12L188.35 69.12Q185.62 69.12 182.70 68.29Q179.78 67.46 177.41 65.41Q175.03 63.36 173.48 59.87Q171.94 56.38 171.94 51.12L171.94 51.12Q171.94 49.25 172.19 46.84Q172.44 44.42 173.23 41.87Q174.02 39.31 175.36 36.83Q176.69 34.34 178.92 32.40Q181.15 30.46 184.28 29.27Q187.42 28.08 191.74 28.08L191.74 28.08Q195.26 28.08 197.82 28.91Q200.38 29.74 202.03 31.14Q203.69 32.54 204.52 34.42Q205.34 36.29 205.34 38.45L205.34 38.45Q205.34 42.34 202.90 44.17Q200.45 46.01 195.98 46.01L195.98 46.01Q194.90 46.01 194.51 45.83Q194.11 45.65 194.11 45L194.11 45Q194.11 43.27 194.04 41.90Q193.97 40.54 193.64 39.60Q193.32 38.66 192.67 38.16Q192.02 37.66 190.80 37.66L190.80 37.66Q188.57 37.66 187.24 39.10Q185.90 40.54 185.22 42.59Q184.54 44.64 184.36 46.80Q184.18 48.96 184.18 50.40L184.18 50.40Q184.18 55.51 185.80 57.53Q187.42 59.54 190.94 59.54ZM230.26 53.35L210.67 53.35Q209.88 53.35 209.88 52.56L209.88 52.56L210.10 48.67Q210.17 47.74 210.35 46.84Q210.53 45.94 211.07 45.22Q211.61 44.50 212.62 44.06Q213.62 43.63 215.28 43.63L215.28 43.63L234.86 43.63Q235.30 43.63 235.66 43.88Q236.02 44.14 236.02 44.64L236.02 44.64L235.73 48.53Q235.58 50.69 234.54 52.02Q233.50 53.35 230.26 53.35L230.26 53.35ZM257.54 69.12L257.54 69.12Q253.30 69.12 250.56 68.58Q247.82 68.04 246.20 67.00Q244.58 65.95 243.97 64.37Q243.36 62.78 243.36 60.62L243.36 60.62Q243.36 59.98 243.43 58.79Q243.50 57.60 243.65 55.44Q243.79 53.28 244.04 49.86Q244.30 46.44 244.73 41.26L244.73 41.26Q245.23 34.85 245.52 31.10Q245.81 27.36 245.95 25.31Q246.10 23.26 246.13 22.43Q246.17 21.60 246.17 21.02L246.17 21.02Q246.17 19.87 246.20 19.15Q246.24 18.43 246.35 18.04Q246.46 17.64 246.71 17.46Q246.96 17.28 247.46 17.28L247.46 17.28Q251.71 16.99 254.70 16.85Q257.69 16.70 259.92 16.70L259.92 16.70Q265.39 16.70 269.32 17.60Q273.24 18.50 275.69 20.16Q278.14 21.82 279.29 24.26Q280.44 26.71 280.44 29.81L280.44 29.81Q280.44 31.54 280.08 33.37Q279.72 35.21 278.86 36.86Q277.99 38.52 276.52 39.78Q275.04 41.04 272.81 41.62L272.81 41.62Q276.98 42.91 278.71 45.90Q280.44 48.89 280.44 52.99L280.44 52.99Q280.44 56.30 279.36 59.22Q278.28 62.14 275.62 64.33Q272.95 66.53 268.56 67.82Q264.17 69.12 257.54 69.12ZM261.65 46.80L261.65 46.80Q260.86 46.80 259.70 46.91Q258.55 47.02 257.33 47.23L257.33 47.23L256.54 58.97Q259.13 59.76 261.22 59.76L261.22 59.76Q263.45 59.76 264.82 59.11Q266.18 58.46 266.94 57.49Q267.70 56.52 267.95 55.33Q268.20 54.14 268.20 53.14L268.20 53.14Q268.20 50.47 266.72 48.64Q265.25 46.80 261.65 46.80ZM258.62 27L258.62 27Q258.48 28.87 258.37 31.39Q258.26 33.91 258.05 36.86L258.05 36.86Q260.35 37.44 262.15 37.44L262.15 37.44Q264.31 37.44 265.61 36.94Q266.90 36.43 267.66 35.64Q268.42 34.85 268.67 33.91Q268.92 32.98 268.92 32.11L268.92 32.11Q268.92 29.88 267.44 28.26Q265.97 26.64 262.37 26.64L262.37 26.64Q261.58 26.64 260.60 26.75Q259.63 26.86 258.62 27ZM302.33 69.12L302.33 69.12Q297.36 69.12 294.08 67.72Q290.81 66.31 288.86 63.86Q286.92 61.42 286.13 58.14Q285.34 54.86 285.34 51.12L285.34 51.12Q285.34 46.80 286.38 42.66Q287.42 38.52 289.94 35.28Q292.46 32.04 296.60 30.06Q300.74 28.08 306.94 28.08L306.94 28.08Q316.01 28.08 319.93 32.51Q323.86 36.94 323.86 44.93L323.86 44.93Q323.86 47.16 323.53 49.86Q323.21 52.56 322.31 55.22Q321.41 57.89 319.86 60.41Q318.31 62.93 315.94 64.87Q313.56 66.82 310.21 67.97Q306.86 69.12 302.33 69.12ZM305.71 37.66L305.71 37.66Q302.98 37.66 301.36 39.06Q299.74 40.46 298.91 42.44Q298.08 44.42 297.83 46.62Q297.58 48.82 297.58 50.33L297.58 50.33Q297.58 55.08 299.09 57.31Q300.60 59.54 303.41 59.54L303.41 59.54Q305.93 59.54 307.55 57.96Q309.17 56.38 310.07 54.14Q310.97 51.91 311.29 49.46Q311.62 47.02 311.62 45.36L311.62 45.36Q311.62 41.76 310.28 39.71Q308.95 37.66 305.71 37.66ZM345.38 69.12L345.38 69.12Q340.42 69.12 337.14 67.72Q333.86 66.31 331.92 63.86Q329.98 61.42 329.18 58.14Q328.39 54.86 328.39 51.12L328.39 51.12Q328.39 46.80 329.44 42.66Q330.48 38.52 333.00 35.28Q335.52 32.04 339.66 30.06Q343.80 28.08 349.99 28.08L349.99 28.08Q359.06 28.08 362.99 32.51Q366.91 36.94 366.91 44.93L366.91 44.93Q366.91 47.16 366.59 49.86Q366.26 52.56 365.36 55.22Q364.46 57.89 362.92 60.41Q361.37 62.93 358.99 64.87Q356.62 66.82 353.27 67.97Q349.92 69.12 345.38 69.12ZM348.77 37.66L348.77 37.66Q346.03 37.66 344.41 39.06Q342.79 40.46 341.96 42.44Q341.14 44.42 340.88 46.62Q340.63 48.82 340.63 50.33L340.63 50.33Q340.63 55.08 342.14 57.31Q343.66 59.54 346.46 59.54L346.46 59.54Q348.98 59.54 350.60 57.96Q352.22 56.38 353.12 54.14Q354.02 51.91 354.35 49.46Q354.67 47.02 354.67 45.36L354.67 45.36Q354.67 41.76 353.34 39.71Q352.01 37.66 348.77 37.66ZM391.61 38.52L387.79 38.52Q387.58 41.26 387.32 43.92Q387.07 46.58 386.86 48.96Q386.64 51.34 386.53 53.21Q386.42 55.08 386.42 56.09L386.42 56.09Q386.42 57.96 386.86 58.57Q387.29 59.18 388.30 59.18L388.30 59.18Q389.09 59.18 389.66 58.90Q390.24 58.61 390.74 58.25Q391.25 57.89 391.64 57.60Q392.04 57.31 392.54 57.31L392.54 57.31Q393.05 57.31 393.48 57.89Q393.91 58.46 393.91 60.55L393.91 60.55Q393.91 64.51 391.75 66.82Q389.59 69.12 384.34 69.12L384.34 69.12Q379.15 69.12 376.67 66.71Q374.18 64.30 374.18 59.33L374.18 59.33Q374.18 58.25 374.29 56.77Q374.40 55.30 374.62 52.92Q374.83 50.54 375.16 47.09Q375.48 43.63 375.84 38.52L375.84 38.52L372.02 38.52Q371.45 38.52 371.34 38.27Q371.23 38.02 371.23 37.51L371.23 37.51L371.45 33.84Q371.52 32.90 371.70 32.00Q371.88 31.10 372.42 30.38Q372.96 29.66 373.97 29.23Q374.98 28.80 376.63 28.80L376.63 28.80Q377.14 27.50 377.78 25.70Q378.43 23.90 379.08 22.21Q379.73 20.52 380.34 19.37Q380.95 18.22 381.46 18.22L381.46 18.22L383.54 18.22Q386.57 18.22 387.72 20.09Q388.87 21.96 388.87 24.55L388.87 24.55Q388.87 25.99 388.66 28.80L388.66 28.80L396.22 28.80Q397.37 28.80 397.37 29.81L397.37 29.81L397.08 33.70Q396.94 35.86 395.89 37.19Q394.85 38.52 391.61 38.52L391.61 38.52Z"/></svg>
diff --git a/magic-boot-ui/src/components/MagicBoot/mb-search.vue b/magic-boot-ui/src/components/MagicBoot/mb-search.vue
index 2f67465..144c530 100644
--- a/magic-boot-ui/src/components/MagicBoot/mb-search.vue
+++ b/magic-boot-ui/src/components/MagicBoot/mb-search.vue
@@ -70,9 +70,9 @@ export default {
     reset() {
       for(var key in this.where){
         if(this.where[key] instanceof Object){
-          this.where[key].value = ''
+          this.where[key].value = null
         }else{
-          this.where[key] = ''
+          this.where[key] = null
         }
       }
       this.$nextTick(() => this.$emit('search'))
diff --git a/magic-boot-ui/src/components/MagicBoot/mb-select.vue b/magic-boot-ui/src/components/MagicBoot/mb-select.vue
index 6c4d924..f9432f0 100644
--- a/magic-boot-ui/src/components/MagicBoot/mb-select.vue
+++ b/magic-boot-ui/src/components/MagicBoot/mb-select.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-select v-if="mbType === 'select'" v-model="selectValue" v-bind="el" :style="{ width }" placeholder="请选择" filterable clearable>
+    <el-select v-if="mbType === 'select'" v-model="selectValue" v-bind="el" :style="{ width }" :placeholder="placeholder || '请选择'" filterable clearable>
       <el-option
         v-for="item in selectList"
         :key="item.value"
@@ -68,6 +68,10 @@ export default {
     el: {
       type: Object,
       default: () => {}
+    },
+    placeholder: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -89,7 +93,7 @@ export default {
       this.loadData()
     },
     selectValue(value) {
-      if (this.el && this.el.multiple && !(this.value instanceof Array)) {
+      if (this.el && this.el.multiple && value.length > 0) {
         value = value.join(',')
       }
       this.$emit('update:value', value)
diff --git a/magic-boot-ui/src/components/MagicBoot/mb-table.vue b/magic-boot-ui/src/components/MagicBoot/mb-table.vue
index 56fe367..806f309 100644
--- a/magic-boot-ui/src/components/MagicBoot/mb-table.vue
+++ b/magic-boot-ui/src/components/MagicBoot/mb-table.vue
@@ -15,7 +15,7 @@
 
       <el-table-column v-if="selection" align="center" type="selection" width="50" />
 
-      <el-table-column v-if="showNo" label="序号" prop="num" align="center" width="100">
+      <el-table-column v-if="showNo" label="序号" prop="num" align="center" width="65">
         <template slot-scope="row">
           <span>{{ row.$index+1 }}</span>
         </template>
diff --git a/magic-boot-ui/src/views/system/role/role-list.vue b/magic-boot-ui/src/views/system/role/role-list.vue
index 7fe3b40..e8f9046 100644
--- a/magic-boot-ui/src/views/system/role/role-list.vue
+++ b/magic-boot-ui/src/views/system/role/role-list.vue
@@ -74,16 +74,16 @@ export default {
     return {
       permissionData: [{
         label: '全部',
-        value: 0
+        value: '0'
       }, {
         label: '自定义',
-        value: 1
+        value: '1'
       }, {
         label: '本级及子级',
-        value: 2
+        value: '2'
       }, {
         label: '本级',
-        value: 3
+        value: '3'
       }],
       tableOptions: {
         url: 'role/list',
@@ -182,7 +182,7 @@ export default {
         name: '',
         menus: '',
         offices: '',
-        permission: 0,
+        permission: '0',
         code: '',
         descRibe: ''
       }
@@ -201,7 +201,7 @@ export default {
     save() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$post('role/save', this.temp).then((response) => {
+          this.$post('role/save', this.temp).then(() => {
             this.reloadTable()
             this.$refs.roleFormDialog.hide()
             this.$notify({
diff --git a/magic-boot-ui/src/views/system/user/user-form.vue b/magic-boot-ui/src/views/system/user/user-form.vue
index b75eade..d1b19d6 100644
--- a/magic-boot-ui/src/views/system/user/user-form.vue
+++ b/magic-boot-ui/src/views/system/user/user-form.vue
@@ -32,7 +32,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="选择角色" prop="roles">
-          <mb-select v-model="temp.roles" url="role/list?size=999999" labelField="name" valueField="id" :el="{ multiple: true }" />
+          <mb-select v-model="temp.roles" url="role/list?size=999999" placeholder="请选择角色" labelField="name" valueField="id" :el="{ multiple: true }" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -84,7 +84,7 @@ export default {
         password: '',
         phone: '',
         isLogin: 0,
-        roles: '',
+        roles: null,
         officeId: null
       }
     },
diff --git a/magic-boot-ui/src/views/system/user/user-list.vue b/magic-boot-ui/src/views/system/user/user-list.vue
index f8bd3b4..fea30d3 100644
--- a/magic-boot-ui/src/views/system/user/user-list.vue
+++ b/magic-boot-ui/src/views/system/user/user-list.vue
@@ -68,6 +68,17 @@ export default {
             type: 'input',
             label: '姓名/昵称',
             value: ''
+          },
+          roleId: {
+            type: 'select',
+            label: '角色',
+            value: null,
+            properties: {
+              url: 'role/list?size=999999',
+              labelField: 'name',
+              valueField: 'id',
+              el: { multiple: true }
+            }
           }
         },
         cols: [
@@ -85,6 +96,10 @@ export default {
             field: 'officeName',
             title: '所属机构'
           },
+          {
+            field: 'roles',
+            title: '角色'
+          },
           {
             field: 'phone',
             title: '手机号',