lidongdong
2022-10-19 15098b044af37e4c4aee8849374b5acd913454f0
修改【后台账号管理】无法搜索  bug
5个文件已修改
34 ■■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/UserController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/ISysUserService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/SysUserMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -170,14 +170,15 @@
    @GetMapping("/getlist")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "userName",required = false) String userName)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",userName);
        int num=IUserService.selectNum("3");
        int num=IUserService.selectNum("3",userName);
        return getDataTable(list,num);
    }
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
@@ -26,7 +26,9 @@
     *
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName);
@@ -63,7 +65,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(@Param("userType") String userType,@Param("userName") String userName);
    /**
     * 根据部门id及分类id获取导办用户
flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -14,7 +14,7 @@
     *
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName);
    SysUser selectData(String userId,String phonenumber);
@@ -48,7 +48,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(String userType,String userName);
    /**
     * 发送验证码(如果没有该用户则新建用户)
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -240,8 +240,8 @@
    }
    @Override
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType) {
        return baseMapper.selectConfigList(page, state,userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName) {
        return baseMapper.selectConfigList(page, state,userType,userName);
    }
    @Override
@@ -284,8 +284,8 @@
    }
    @Override
    public int selectNum(String userType) {
        return baseMapper.selectNum(userType);
    public int selectNum(String userType,String userName) {
        return baseMapper.selectNum(userType,userName);
    }
flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -91,6 +91,9 @@
    <select id="selectNum" parameterType="string" resultType="integer">
        select count(user_id) from automessage_sys_user
        <where>
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%')
            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>
@@ -111,9 +114,9 @@
    <select id="selectConfigList" parameterType="string" resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
        <where>
<!--            <if test="userName != null and userName != ''">-->
<!--                AND user_name like concat('%', #{userName}, '%')-->
<!--            </if>-->
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%')
            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>