From 7e277af67efbba9690fcc33525b92d3eb5f3cac9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 11 七月 2025 09:43:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 3 +++
src/main/webapp/views/user/user.html | 6 ++++++
src/main/java/com/zy/asrs/entity/WrkMast.java | 3 +++
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 3 +++
src/main/webapp/static/js/user/user.js | 2 +-
5 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 393cd0f..6f35eb9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -446,6 +446,9 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
if (!Cools.isEmpty(user)){
+ if(Cools.isEmpty(user.getNickname())){
+ return String.valueOf(user.getUsername());
+ }
return String.valueOf(user.getNickname());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index f9d53fa..6073321 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -463,6 +463,9 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
if (!Cools.isEmpty(user)){
+ if(Cools.isEmpty(user.getNickname())){
+ return String.valueOf(user.getUsername());
+ }
return String.valueOf(user.getNickname());
}
return null;
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index c0c4e4b..3306946 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -120,6 +120,9 @@
if(user.getRoleId() != null) {
entity.setRoleId(user.getRoleId());
}
+ if(user.getNickname()!=null) {
+ entity.setNickname(user.getNickname());
+ }
userService.updateById(entity);
return R.ok();
}
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 0e06c7e..dfc5871 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -24,7 +24,7 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
- // ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
+ ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
,{field: 'username', align: 'center',title: '鐧诲綍璐︽埛'}
,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
// ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index d2611c8..744be99 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -136,6 +136,12 @@
<input name="email" placeholder="璇疯緭鍏ラ偖绠�" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input name="nickname" placeholder="璇疯緭鍏ュ悕绉�" class="layui-input">
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.1