From 5701eb6693c654d53f1bba460eb3a417d495b344 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 11 六月 2025 17:31:53 +0800
Subject: [PATCH] bug修复；下发任务给rcs携带货架码
---
src/main/java/com/zy/system/controller/UserController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index a823f5a..c175ac5 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -80,7 +80,7 @@
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
public R edit(User user) {
if (Cools.isEmpty(user)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
if (null == user.getId()){
user.setStatus(1);
@@ -105,7 +105,7 @@
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
public R update(User user){
if (Cools.isEmpty(user) || null==user.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
User entity = userService.selectById(user.getId());
if (user.getPassword()!=null) {
@@ -117,6 +117,9 @@
if (user.getMobile()!=null) {
entity.setMobile(user.getMobile());
}
+ if (user.getRoleId() !=null) {
+ entity.setRoleId(user.getRoleId());
+ }
userService.updateById(entity);
return R.ok();
}
--
Gitblit v1.9.1