From 85101442ba00e13c50356c599d45c58a4034ba43 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Jun 2021 17:26:40 +0800
Subject: [PATCH] screen-manage 修改user更新字段
---
screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java | 2 ++
screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java
index 0a73bb5..29b53fb 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java
@@ -34,6 +34,8 @@
private String wechat;
+ private String userName;
+
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date expireTime;
@@ -55,6 +57,7 @@
public User formConvertEntity(){
User user = new User();
user.setId(id);
+ user.setUserName(userName);
if (!ObjectUtils.isEmpty(password))
user.setPassword(MD5Utils.saltMD5(AESUtils.decrypt(password)));
user.setEmail(email);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
index 137a78a..b220c29 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
+import com.sun.corba.se.spi.presentation.rmi.IDLNameTranslator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +49,7 @@
@Autowired
GroupMenuMapper groupMenuMapper;
+
@Override
public MenuQueryDTO queryAllMenus() {
//������������������
--
Gitblit v1.8.0