chenrui
11 小时以前 4398a57a5d01d5dd4331f8a04f29f5fd9229a737
客户修改
已修改4个文件
23 ■■■■ 文件已修改
src/main/java/com/ruoyi/basic/pojo/Customer.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/system/SysUserDeptMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
}
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));
    }
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;
}
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>