From adeec8aafe23ed8255941db26e2245d7da8f6405 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 08 一月 2025 15:30:41 +0800
Subject: [PATCH] 修改了家庭设备排序时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 2c0b08c..b46a287 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -27,6 +27,7 @@
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -51,7 +52,8 @@
@RestController
@RequestMapping("/self/user")
public class ZInfoUserController extends BaseController {
-
+ @Autowired
+ private ISysUserService userService;
@Resource
private ZInfoUserService zInfoUserService;
@@ -175,6 +177,20 @@
Long userId = user.getUserId();
zInfoUser.setSysId(userId);
+
+
+ user.setSex(zInfoUser.getSex()+"");
+ user.setUserName(zInfoUser.getOldName());
+ user.setPhonenumber(zInfoUser.getPhoneNumber());
+//
+// us.setUserId(user.getSysId());
+// us.setUserName(user.getUserName());
+// us.setNickName(user.getNickName());
+// us.setRoleId(user.getRoleId());
+// us.setSex(user.getSex());
+// us.setStatus(user.getStatus());
+// us.setRemark(user.getRemark());
+ userService.updateUser(user);
//LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
// uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
@@ -405,9 +421,16 @@
* 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
*/
@PostMapping("/byName")
- public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
+ public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
{
- return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());
+
+ List<SysUser> strings = sysUserMapper.getUserByUserName(sysUser.getUserName());
+ List<String> strings1= new ArrayList<>();
+ for (SysUser s:strings){
+ strings1.add(s.getNickName());
+ }
+
+ return zInfoUserService.findUserNameAClan(strings1);
}
}
--
Gitblit v1.9.1