From 4398a57a5d01d5dd4331f8a04f29f5fd9229a737 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 03 六月 2025 17:31:32 +0800
Subject: [PATCH] 客户修改
---
src/main/resources/mapper/system/SysUserDeptMapper.xml | 5 +++++
src/main/java/com/ruoyi/basic/pojo/Customer.java | 10 ++++++++++
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 6 ++----
src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java | 2 ++
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 47901ec..1c7898a 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -82,4 +83,13 @@
@TableField(exist = false)
private String addressPhone;
+
+ @ApiModelProperty(value = "閾惰鍩烘湰鎴�")
+ private String basicBankAccount;
+
+ @ApiModelProperty(value = "閾惰璐﹀彿")
+ private String bankAccount;
+
+ @ApiModelProperty(value = "寮�鎴疯鍙�")
+ private String bankCode;
}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index e7739aa..5925a68 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -109,10 +109,8 @@
}
}
- @GetMapping("/userDeptList/{userId}")
- public AjaxResult userDeptList(@PathVariable Long userId){
- SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();
- sysUserDeptVo.setUserId(userId);
+ @GetMapping("/userDeptList")
+ public AjaxResult userDeptList(SysUserDeptVo sysUserDeptVo){
return AjaxResult.success(userDeptService.selectUserDeptList(sysUserDeptVo));
}
diff --git a/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java b/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
index 8135c26..0bf2406 100644
--- a/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
+++ b/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
@@ -12,4 +12,6 @@
public class SysUserDeptVo extends SysUserDept {
private String deptName;
+
+ private String userName;
}
diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 0a62acb..898d3d1 100644
--- a/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -16,6 +16,11 @@
<if test="userDeptVo.userId != null">
T1.user_id = #{userDeptVo.userId}
</if>
+ <if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
+ T1.user_id IN (
+ SELECT user_id FROM sys_user WHERE nick_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
+ )
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3