From 0891e0aff0acddc18ba8f0bae8e18463d51ed233 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 28 Sep 2022 11:50:35 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF):=20?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?DE=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/ext/AuthMapper.xml        | 6 +++---
 .../java/io/dataease/plugins/server/XDingtalkServer.java    | 2 +-
 .../main/java/io/dataease/plugins/server/XLarkServer.java   | 2 +-
 .../main/java/io/dataease/plugins/server/XWecomServer.java  | 2 +-
 backend/src/main/resources/db/migration/V40__1.15.sql       | 2 +-
 frontend/src/layout/components/Topbar.vue                   | 2 +-
 frontend/src/router/index.js                                | 6 +-----
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/ext/AuthMapper.xml
index 2d897cfd1a..ac07e54e79 100644
--- a/backend/src/main/java/io/dataease/ext/AuthMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/AuthMapper.xml
@@ -109,7 +109,7 @@
 
     <select id="findWecomUser" resultMap="baseMap">
         select
-            user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
+            u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
         from
             sys_user_assist a
         left join
@@ -119,7 +119,7 @@
 
     <select id="findDingtalkUser" resultMap="baseMap">
         select
-            user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
+            u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
         from
             sys_user_assist a
             left join
@@ -129,7 +129,7 @@
 
     <select id="findLarkUser" resultMap="baseMap">
         select
-            user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
+            u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
         from
             sys_user_assist a
             left join
diff --git a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
index 169322eb8c..474ae29640 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
@@ -150,7 +150,7 @@ public class XDingtalkServer {
     public void bind(@RequestParam("code") String code, @RequestParam("state") String state) {
 
         HttpServletResponse response = ServletUtils.response();
-        String url = "/#personal";
+        String url = "/#person-info/index";
 
 
         DingtalkXpackService dingtalkXpackService = null;
diff --git a/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java b/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java
index 58066af86c..5e6711324e 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java
@@ -151,7 +151,7 @@ public class XLarkServer {
     public void bind(@RequestParam("code") String code, @RequestParam("state") String state) {
 
         HttpServletResponse response = ServletUtils.response();
-        String url = "/#personal";
+        String url = "/#person-info/index";
 
         LarkXpackService larkXpackService = null;
         try {
diff --git a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java
index afa1a47835..c92d31c1ed 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java
@@ -156,7 +156,7 @@ public class XWecomServer {
 
     @GetMapping("/bind")
     public void bind(@RequestParam("code") String code, @RequestParam("state") String state) {
-        String url = "/#personal";
+        String url = "/#person-info/index";
         HttpServletResponse response = ServletUtils.response();
 
         WecomXpackService wecomXpackService = null;
diff --git a/backend/src/main/resources/db/migration/V40__1.15.sql b/backend/src/main/resources/db/migration/V40__1.15.sql
index f4e4faee31..0b34538a39 100644
--- a/backend/src/main/resources/db/migration/V40__1.15.sql
+++ b/backend/src/main/resources/db/migration/V40__1.15.sql
@@ -126,7 +126,7 @@ INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_typ
 INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`, `copy_id`) VALUES ('d55c4d88-3b0a-11ed-8009-0242ac130005', '379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1663915323000, NULL, NULL, NULL);
 INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`) VALUES ('379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'bdfcc324-1181-46a6-b681-a453517c4ffa', 'dataset', '2', 'user', 1663915323123, NULL, 'admin', NULL, NULL, NULL);
 
-DELETE from `sys_menu` where `menu_id` = 50;
+
 
 
 
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 40f32607a4..f580b1a2c3 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -46,7 +46,7 @@
           <span><i class="el-icon-arrow-down el-icon--right" /></span>
         </div>
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/personal">
+          <router-link to="/person-info/index">
             <el-dropdown-item>{{ $t('commons.personal_info') }}</el-dropdown-item>
           </router-link>
 
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 1a8b862514..066503b320 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -76,11 +76,7 @@ export const constantRoutes = [
     component: () => import('@/views/link'),
     hidden: true
   },
-  {
-    path: '/personal',
-    component: () => import('@/views/system/user/privateForm'),
-    hidden: true
-  },
+
   {
     path: '/preview/:reportId',
     component: () => import('@/components/canvas/components/Editor/PreviewEject'),