From 5a214ae4965c3539a0b3ec793f38002ad0b335cd Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 21 二月 2025 15:36:12 +0800
Subject: [PATCH] 修改操作用户
---
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java | 61 +++++++++++++++
/dev/null | 69 -----------------
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java | 1
ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java | 61 +++++++++++++++
ruoyi-applet/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java | 2
6 files changed, 125 insertions(+), 71 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
new file mode 100644
index 0000000..e5836a2
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
@@ -0,0 +1,61 @@
+package com.ruoyi.web.core.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author xiaochen
+ * @ClassName DataUpdateInterceptor
+ * @Description 数据更新操作处理
+ * @date 2021-12-15
+ * <p>
+ * 注意，之前在此处注入了 JwtTokenUtils
+ * <p>
+ * 造成spring循环依赖，项目支棱不起来
+ */
+@Slf4j
+@Configuration
+public class DataUpdateHandlerConfig implements MetaObjectHandler {
+
+ /**
+ * 新增数据执行
+ *
+ * @param metaObject
+ */
+ @Override
+ public void insertFill(MetaObject metaObject) {
+ // 获取登录信息
+ String userName = SecurityUtils.getUsername();
+ if (StringUtils.isNotBlank(userName)) {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ } else {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ }
+
+ }
+
+ /**
+ * 修改数据执行
+ *
+ * @param metaObject
+ */
+ @Override
+ public void updateFill(MetaObject metaObject) {
+ // 获取登录信息
+ String userName = SecurityUtils.getUsername();
+ if (StringUtils.isNotBlank(userName)){
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ } else {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ }
+
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/MybatisPlusConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java
similarity index 97%
rename from ruoyi-common/src/main/java/com/ruoyi/common/config/MybatisPlusConfig.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java
index 1366f2b..fac9a9f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/MybatisPlusConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.config;
+package com.ruoyi.web.core.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index c784c42..3f0f789 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -135,6 +135,7 @@
LoginUserApplet loginUserApplet = new LoginUserApplet();
TTenantResp tTenantResp = new TTenantResp();
BeanUtils.copyProperties(tenant, tTenantResp);
+ tTenantResp.setResidentName(appletUserDecodeData.getPhoneNumber());
loginUserApplet.setUser(tTenantResp);
loginUserApplet.setUserId(tenant.getId());
Map<String, Object> tokenInfos = new HashMap<>();
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
new file mode 100644
index 0000000..bf32258
--- /dev/null
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
@@ -0,0 +1,61 @@
+package com.ruoyi.web.core.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author xiaochen
+ * @ClassName DataUpdateInterceptor
+ * @Description 数据更新操作处理
+ * @date 2021-12-15
+ * <p>
+ * 注意，之前在此处注入了 JwtTokenUtils
+ * <p>
+ * 造成spring循环依赖，项目支棱不起来
+ */
+@Slf4j
+@Configuration
+public class DataUpdateHandlerConfig implements MetaObjectHandler {
+
+ /**
+ * 新增数据执行
+ *
+ * @param metaObject
+ */
+ @Override
+ public void insertFill(MetaObject metaObject) {
+ // 获取登录信息
+ String userName = SecurityUtils.getUsernameApplet();
+ if (StringUtils.isNotBlank(userName)) {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ } else {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ }
+
+ }
+
+ /**
+ * 修改数据执行
+ *
+ * @param metaObject
+ */
+ @Override
+ public void updateFill(MetaObject metaObject) {
+ // 获取登录信息
+ String userName = SecurityUtils.getUsernameApplet();
+ if (StringUtils.isNotBlank(userName)){
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ } else {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ }
+
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/MybatisPlusConfig.java b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java
similarity index 97%
copy from ruoyi-common/src/main/java/com/ruoyi/common/config/MybatisPlusConfig.java
copy to ruoyi-applet/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java
index 1366f2b..fac9a9f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/MybatisPlusConfig.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.config;
+package com.ruoyi.web.core.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
deleted file mode 100644
index a06e738..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.common.config;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author xiaochen
- * @ClassName DataUpdateInterceptor
- * @Description 数据更新操作处理
- * @date 2021-12-15
- * <p>
- * 注意，之前在此处注入了 JwtTokenUtils
- * <p>
- * 造成spring循环依赖，项目支棱不起来
- */
-@Slf4j
-@Configuration
-public class DataUpdateHandlerConfig implements MetaObjectHandler {
-
- /**
- * 新增数据执行
- *
- * @param metaObject
- */
- @Override
- public void insertFill(MetaObject metaObject) {
- // 获取登录信息
- String userName = SecurityUtils.getUsername();
- String userName2 = SecurityUtils.getUsernameApplet();
- if (StringUtils.isNotBlank(userName)||StringUtils.isNotBlank(userName2)){
- if (StringUtils.isNotBlank(userName)) {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- } else {
- this.setFieldValByName("createBy", userName2, metaObject);
- this.setFieldValByName("updateBy", userName2, metaObject);
- }
- }
-
- }
-
- /**
- * 修改数据执行
- *
- * @param metaObject
- */
- @Override
- public void updateFill(MetaObject metaObject) {
- // 获取登录信息
- String userName = SecurityUtils.getUsername();
- String userName2 = SecurityUtils.getUsernameApplet();
- if (StringUtils.isNotBlank(userName)||StringUtils.isNotBlank(userName2)){
- if (StringUtils.isNotBlank(userName)) {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- } else {
- this.setFieldValByName("createBy", userName2, metaObject);
- this.setFieldValByName("updateBy", userName2, metaObject);
- }
- }
-
- }
-}
--
Gitblit v1.7.1