From 6a8a9c6e40604f6db915cf4702717442d57fd974 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 15 Aug 2023 21:07:21 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../check/dao/mapper/xml/StIvtCheckdtlBcpMapper.xml   |  2 +-
 .../system_manage/controller/user/UserController.java |  7 ++++---
 mes/qd/src/views/system/user/center.vue               | 11 +++++++----
 mes/qd/src/views/system/user/center/updateEmail.vue   |  3 ++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckdtlBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckdtlBcpMapper.xml
index 5fd422bc..1a3c6c67 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckdtlBcpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckdtlBcpMapper.xml
@@ -43,7 +43,7 @@
         dtl.*
         FROM
         sch_base_task task
-        LEFT JOIN st_ivt_structattr sa ON (sa.struct_code = task.point_code2 OR sa.struct_code = task.point_code1)
+        LEFT JOIN st_ivt_structattr sa ON (sa.struct_code = task.point_code3 OR sa.struct_code = task.point_code1)
         LEFT JOIN st_ivt_checkdtl_bcp dtl ON dtl.struct_id = sa.struct_id
         LEFT JOIN st_ivt_checkmst_bcp mst ON mst.check_id = dtl.check_id
         <where>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
index fb5a35f5..6f6ae8c6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
@@ -17,6 +17,7 @@ package org.nl.wms.system_manage.controller.user;
 
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -82,12 +83,12 @@ public class UserController {
 
     @Log("修改用户：个人中心")
     //("修改用户：个人中心")
-//    @PutMapping(value = "center")
+    @PutMapping(value = "center")
     public ResponseEntity<Object> center(@RequestBody SysUser resources){
-        if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){
+        if(!resources.getUser_id().equals(StpUtil.getLoginIdAsString())){
             throw new BadRequestException("不能修改他人资料");
         }
-        userService.saveOrUpdate(resources);
+        userService.update(JSON.parseObject(JSON.toJSONString(resources)));
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
diff --git a/mes/qd/src/views/system/user/center.vue b/mes/qd/src/views/system/user/center.vue
index d2110042..462444e4 100644
--- a/mes/qd/src/views/system/user/center.vue
+++ b/mes/qd/src/views/system/user/center.vue
@@ -20,7 +20,7 @@
             </div>
             <ul class="user-info">
               <li><div style="height: 100%"><svg-icon icon-class="login" /> 登录账号<div class="user-right">{{ user.username }}</div></div></li>
-              <li><svg-icon icon-class="user1" /> 用户姓名 <div class="user-right">{{ user.personName }}</div></li>
+              <li><svg-icon icon-class="user1" /> 用户姓名 <div class="user-right">{{ user.person_name }}</div></li>
               <li><svg-icon icon-class="dept" /> 所属部门
                 <el-tooltip effect="dark" placement="top">
                   <div slot="content">
@@ -123,7 +123,7 @@ import store from '@/store'
 import { isvalidPhone } from '@/utils/validate'
 import { parseTime } from '@/utils/index'
 import crud from '@/mixins/crud'
-import { editUser } from '@/views/system/user'
+import { editUser } from '@/views/system/user/user'
 import Avatar from '@/assets/images/avatar.png'
 export default {
   name: 'Center',
@@ -170,7 +170,7 @@ export default {
     ])
   },
   created() {
-    this.form = { id: this.user.id, personName: this.user.personName, gender: this.user.gender, phone: this.user.phone }
+    this.form = { id: this.user.id, personName: this.user.person_name, gender: this.user.gender, phone: this.user.phone }
     store.dispatch('GetInfo').then(() => {})
   },
   methods: {
@@ -195,7 +195,10 @@ export default {
         this.$refs['form'].validate((valid) => {
           if (valid) {
             this.saveLoading = true
-            editUser(this.form).then(() => {
+            this.user.person_name = this.form.personName
+            this.user.gender = this.form.gender
+            this.user.phone = this.form.phone
+            editUser(this.user).then(() => {
               this.editSuccessNotify()
               store.dispatch('GetInfo').then(() => {})
               this.saveLoading = false
diff --git a/mes/qd/src/views/system/user/center/updateEmail.vue b/mes/qd/src/views/system/user/center/updateEmail.vue
index aa983658..e46817c5 100644
--- a/mes/qd/src/views/system/user/center/updateEmail.vue
+++ b/mes/qd/src/views/system/user/center/updateEmail.vue
@@ -20,7 +20,7 @@
 <script>
 import store from '@/store'
 import { validEmail } from '@/utils/validate'
-import { updateEmail } from '@/views/system/user'
+import { updateEmail } from '@/views/system/user/user'
 import { resetEmail } from '@/api/system/code'
 export default {
   props: {
@@ -93,6 +93,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
+          this.form.code = '1'
           updateEmail(this.form).then(res => {
             this.loading = false
             this.resetForm()