修改后台账号Bug

fengjin

2022-11-16 8220bf4f67aec67c6ad14146b855e6060b792ab1

修改后台账号Bug

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -58,7 +58,7 @@
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);

        int num=IUserService.selectNum("2",keyword,ids);
        int num=IUserService.selectNum("2",keyword,ids,null);
        return getDataTable(list,num);
    }


 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -197,7 +197,7 @@
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");

        int num=IUserService.selectNum("3",keyword,null);
        int num=IUserService.selectNum("3",keyword,null,"1");
        return getDataTable(list,num);
    }


 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -71,7 +71,8 @@
     */
    public int selectNum(@Param("userType") String userType,
                         @Param("userName") String userName,
                         @Param("ids") List<String> ids);
                         @Param("ids") List<String> ids,
                         @Param("isDivisionHead") String  isDivisionHead);

    /**
     * 根据部门id及分类id获取导办用户

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -49,7 +49,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType,String userName,List<String> ids);
    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead);

    /**
     * 发送验证码(如果没有该用户则新建用户)

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -298,8 +298,8 @@
    }

    @Override
    public int selectNum(String userType,String userName,List<String> ids) {
        return baseMapper.selectNum(userType,userName,ids);
    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead) {
        return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
    }



 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -119,7 +119,7 @@
                    #{param}
                </foreach>
            </if>
            <if test="isDivisionHead != null and != ''">
            <if test="isDivisionHead != null and isDivisionHead != ''">
                AND is_division_head=#{isDivisionHead}
            </if>
            <if test="userName != null and userName != ''">
@@ -155,8 +155,8 @@
                    #{param}
                </foreach>
            </if>
            <if test="isDivisionHead != null and != ''">
                AND is_division_head=#{isDivisionHead}
            <if test="isDivisionHead != null and isDivisionHead != ''">
                and is_division_head=#{isDivisionHead}
            </if>
            <if test="userName != null and userName != ''">
                AND (user_name like concat('%', #{userName}, '%') or