From 72f21494ba48e573e68007eab2296f8c25ecc4b7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:12 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java | 2 ++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 8 ++++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 9 +++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 2 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java | 9 ++++++---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 10 ++++++++++
zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java | 4 ++--
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 11 +++++++----
9 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
index 6da7b2b..de1e26c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -32,6 +32,8 @@
// {
// return error("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
// }
+ System.out.println(user);
+ // String msg = "";
String msg = registerService.register(user);
return StringUtils.isEmpty(msg) ? success() : error(msg);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index be97a3d..52534e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -144,7 +144,7 @@
SysUser sysUser = userService.selectUserById(userId);
ajax.put(AjaxResult.DATA_TAG, sysUser);
ajax.put("postIds", postService.selectPostListByUserId(userId));
- ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+// ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
}
return ajax;
}
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 36f9b01..b762e93 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
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
@@ -156,8 +157,12 @@
// }
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- zInfoUser.setUserId(userId);
- return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+ zInfoUser.setSysId(userId);
+
+ LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
+ uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+ return toAjax(zInfoUserService.update(uw));
+ // saveOrUpdate(zInfoUser));
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 95347de..1dc0d3d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -73,10 +73,10 @@
private Date loginDate;
/** 閮ㄩ棬瀵硅薄 */
- @Excels({
- @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
- @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
- })
+// @Excels({
+// @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
+// @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
+// })
private SysDept dept;
/** 瑙掕壊瀵硅薄 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
index 3e9b8f4..c9308ad 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -7,6 +7,16 @@
*/
public class LoginBody
{
+ @Override
+ public String toString() {
+ return "LoginBody{" +
+ "username='" + username + '\'' +
+ ", nickname='" + nickname + '\'' +
+ ", password='" + password + '\'' +
+ ", code='" + code + '\'' +
+ ", uuid='" + uuid + '\'' +
+ '}';
+ }
public String getNickname() {
return nickname;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
index a8fca76..49b593c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
@@ -44,10 +44,13 @@
*/
public String register(RegisterBody registerBody)
{
- String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
+ String msg = "", username = registerBody.getNickname(), password = registerBody.getPassword();
SysUser sysUser = new SysUser();
- sysUser.setUserName(username);
+// System.out.println(username);
+// System.out.println("+++++++++++++++++++++==");
+ sysUser.setNickName(username);
+ sysUser.setUserName(username);
// 楠岃瘉鐮佸紑鍏�
boolean captchaEnabled = configService.selectCaptchaEnabled();
if (captchaEnabled)
@@ -73,7 +76,7 @@
{
msg = "瀵嗙爜闀垮害蹇呴』鍦�5鍒�20涓瓧绗︿箣闂�";
}
- else if (!userService.checkUserNameUnique(sysUser))
+ else if (!userService.checkNickNameUnique(sysUser))
{
msg = "淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪";
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 63896ab..095b1b3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -149,6 +149,12 @@
@Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
private Integer isMyFamily;
+ /**
+ * 鑷垜浠嬬粛
+ */
+
+ @Excel(name = "鑷垜浠嬬粛")
+ private String selfIntroduction;
@TableField(exist = false)
private String familyName;
@@ -223,10 +229,7 @@
*/
private String secondFamilyId;
- /**
- * 鑷垜浠嬬粛
- */
- private String selfIntroduction;
+
private Long sysId;
/**
* 浠ｆ暟
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
index 38025f6..90e9a4d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
@@ -35,11 +35,11 @@
/**
* 瀹跺涵鍚嶇О
*/
- @Excel(name="鐖朵翰id")
+// @Excel(name="鐖朵翰id")
private Long fid;
- @Excel(name="姣嶄翰id")
+// @Excel(name="姣嶄翰id")
private Long mid;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java
index 04a02f2..fe03d2d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java
@@ -27,7 +27,7 @@
lqw.eq(ZHealthNote::getUid,userId);
ZHealthNote result = getOne(lqw);
if(result == null){
- throw new RuntimeException("璇峰厛濉啓濂芥暟鎹�");
+ throw new RuntimeException("璇峰厛濉啓濂界敓娲讳範鎯暟鎹紒");
}
return AjaxResult.success(result);
--
Gitblit v1.9.1