From 25a336fe72211afc54725ac3b59451ab5d5360f8 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Wed, 28 Sep 2022 17:31:46 +0800
Subject: [PATCH] =?UTF-8?q?jpa=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=AD=BB=E5=BE=AA=E7=8E=AF=E3=80=81=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/UserServiceImpl.java  | 20 ++++++++++---------
 .../src/main/resources/config/application.yml |  2 ++
 .../src/layout/components/Sidebar/Logo.vue    |  8 +++++++-
 nladmin-ui/src/views/login.vue                |  7 ++++++-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
index 708d108be..23c5723ed 100644
--- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
+++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
@@ -125,16 +125,18 @@ public class UserServiceImpl implements UserService {
         if(!resources.getEnabled()){
             onlineUserService.kickOutForUsername(resources.getUsername());
         }
-        user.setUsername(resources.getUsername());
-        user.setEmail(resources.getEmail());
-        user.setEnabled(resources.getEnabled());
-        user.setRoles(resources.getRoles());
-        user.setDept(resources.getDept());
-        user.setPhone(resources.getPhone());
-        user.setNickName(resources.getNickName());
-        user.setGender(resources.getGender());
+        User clone = new User(); // jpa 多表问题，需要用新的类来进行修改
+        clone.setId(resources.getId());
+        clone.setUsername(resources.getUsername());
+        clone.setEmail(resources.getEmail());
+        clone.setEnabled(resources.getEnabled());
+        clone.setRoles(resources.getRoles());
+        clone.setDept(resources.getDept());
+        clone.setPhone(resources.getPhone());
+        clone.setNickName(resources.getNickName());
+        clone.setGender(resources.getGender());
 
-        userRepository.save(user);
+        userRepository.save(clone);
         // 清除缓存
         delCaches(user.getId(), user.getUsername());
         // 修改session
diff --git a/nladmin-system/src/main/resources/config/application.yml b/nladmin-system/src/main/resources/config/application.yml
index 2e8998265..7e3fbea7d 100644
--- a/nladmin-system/src/main/resources/config/application.yml
+++ b/nladmin-system/src/main/resources/config/application.yml
@@ -76,3 +76,5 @@ security:
     - /actuator/**
     # 上传
     - /api/localStorage/pictures
+    # 参数
+    - /api/param/getValueByCode
diff --git a/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/nladmin-ui/src/layout/components/Sidebar/Logo.vue
index 812bf8f28..bc2a53d0b 100644
--- a/nladmin-ui/src/layout/components/Sidebar/Logo.vue
+++ b/nladmin-ui/src/layout/components/Sidebar/Logo.vue
@@ -35,8 +35,14 @@ export default {
   data() {
     return {
       title: '诺力开发平台',
-      logo: Logo
+      logo: Logo,
+      title_param: 'platform'
     }
+  },
+  created() {
+    this.getValueByCode(this.title_param).then(res => {
+      this.title = res.value
+    })
   }
 }
 </script>
diff --git a/nladmin-ui/src/views/login.vue b/nladmin-ui/src/views/login.vue
index 2a1367069..976355eb3 100644
--- a/nladmin-ui/src/views/login.vue
+++ b/nladmin-ui/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="login" :style="'background-image:url('+ Background +');'">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        诺力开发平台</h3>
+        {{title}}</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -50,6 +50,8 @@ export default {
   name: 'Login',
   data() {
     return {
+      title: '诺力开发平台',
+      title_param: 'platform',
       Background: Background,
       codeUrl: '',
       cookiePass: '',
@@ -78,6 +80,9 @@ export default {
     }
   },
   created() {
+    this.getValueByCode(this.title_param).then(res => {
+      this.title = res.value
+    })
     // 获取验证码
     this.getCode()
     // 获取用户名密码等Cookie