From cdb22d98f54b8e761fc6216d0b1871a183f5deb0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 26 十二月 2025 14:34:18 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 10 +++++++---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java | 3 +++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 91172d9..750d184 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -132,10 +132,14 @@
}
TAppUser appUser = appUserService.getById(dto.getId());
String code = appUser.getCode();
- if (dto.getCode() != null && !dto.getCode().isEmpty() && code!=null && !code.equals(dto.getCode())) {
+ if(code==null){
appUser.setCode(dto.getCode());
- // 移除之前的二维码
- redisTemplate.delete("USER_WX_IMG" + appUser.getId());
+ }else {
+ if (dto.getCode() != null && !dto.getCode().isEmpty() && !dto.getCode().equals(code)) {
+ appUser.setCode(dto.getCode());
+ // 移除之前的二维码
+ redisTemplate.delete("USER_WX_IMG" + appUser.getId());
+ }
}
if (dto.getPromotionStatus() != null) {
appUser.setPromotionStatus(dto.getPromotionStatus());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
index 3232611..daec693 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
@@ -126,6 +126,7 @@
user.setPassword(company.getPassword());
user.setPhonenumber(company.getChargePersonPhone());
user.setNickName(company.getChargePerson());
+ user.setCode(company.getCode());
user.setRoleId(2l);
if (!userService.checkUserNameUnique(user)) {
return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -267,6 +268,8 @@
{
return R.fail("新增用户'" + user.getUserName() + "'失败，推广号已存在");
}
+
+
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 5d8172d..972f7d3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -323,6 +323,7 @@
<if test="remark != null and remark != ''">remark,</if>
<if test="code != null and code != ''">code,</if>
<if test="isAdmin != null">is_admin,</if>
+ <if test="companyId != null">company_id,</if>
<if test="roleType != null">role_type,</if>
create_time
)values(
@@ -341,6 +342,7 @@
<if test="remark != null and remark != ''">#{remark},</if>
<if test="code != null and code != ''">#{code},</if>
<if test="isAdmin != null">#{isAdmin},</if>
+ <if test="companyId != null">#{companyId},</if>
<if test="roleType != null">#{roleType},</if>
sysdate()
)
@@ -364,6 +366,7 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="disableRemark != null">disable_remark = #{disableRemark},</if>
+ <if test="code != null and code!=''">code = #{code},</if>
<if test="companyId != null">company_id = #{companyId},</if>
update_time = sysdate()
</set>
--
Gitblit v1.7.1