lidongdong
2023-10-27 aaddc4d9c241bd28695b0dfc05d6b32576a2b9c7
修改网格员查询接口
7个文件已修改
33 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiReseauPeopleApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiReseauPeopleDao.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiReseauPeopleService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiReseauPeopleServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiReseauPeopleMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -1030,7 +1030,8 @@
     */
    @GetMapping("/jinhuiReseau/getPeopleUserList")
    public R getPeopleUserList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize") int pageSize);
                               @RequestParam("pageSize") int pageSize,
                               @RequestParam(value = "nameAndPhone", required = false) String nameAndPhone);
    /**
     * 详情
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -1366,9 +1366,10 @@
    @ApiOperation(value = "金汇网格员管理社区用户列表",response = LoginUserInfoVO.class)
    @GetMapping("/getPeopleUserList")
    public R getPeopleUserList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize") int pageSize)
                               @RequestParam("pageSize") int pageSize,
                               @RequestParam(value = "nameAndPhone", required = false) String nameAndPhone)
    {
        return jinhuiCommunityService.getPeopleUserList(pageNum,pageSize);
        return jinhuiCommunityService.getPeopleUserList(pageNum,pageSize,nameAndPhone);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiReseauPeopleApi.java
@@ -113,9 +113,10 @@
     */
    @GetMapping("/getPeopleUserList")
    public R getPeopleUserList(@RequestParam("pageNum") int pageNum,
                           @RequestParam("pageSize") int pageSize)
                               @RequestParam("pageSize") int pageSize,
                               @RequestParam(value = "nameAndPhone", required = false) String nameAndPhone)
    {
        return peopleService.getUserList(pageNum,pageSize,getCommunityId()+"");
        return peopleService.getUserList(pageNum,pageSize,getCommunityId()+"",nameAndPhone);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiReseauPeopleDao.java
@@ -20,7 +20,9 @@
    IPage<JinhuiReseauPeople> getList(Page page);
    IPage<LoginUserInfoVO> getUserList(Page page,@Param("communityId") String communityId);
    IPage<LoginUserInfoVO> getUserList(Page page,
                                       @Param("communityId") String communityId,
                                       @Param("nameAndPhone") String nameAndPhone);
    /**
     * 详情
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiReseauPeopleService.java
@@ -14,7 +14,7 @@
     */
    R getList(int pageNum,int pageSize);
    R getUserList(int pageNum,int pageSize,String communityId);
    R getUserList(int pageNum,int pageSize,String communityId,String nameAndPhone);
    JinhuiReseauPeople getDetails(String id);
    /**
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiReseauPeopleServiceImpl.java
@@ -27,10 +27,10 @@
    }
    @Override
    public R getUserList(int pageNum, int pageSize, String communityId)
    public R getUserList(int pageNum, int pageSize, String communityId,String nameAndPhone)
    {
        Page page = new Page<LoginUserInfoVO>(pageNum,pageSize);
        return R.ok(baseMapper.getUserList(page,communityId));
        return R.ok(baseMapper.getUserList(page,communityId,nameAndPhone));
    }
    @Override
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiReseauPeopleMapper.xml
@@ -152,8 +152,16 @@
            binding_check_unit_id,
            love_integral
        from sys_user
        where
        <where>
            community_id=#{communityId}
            <if test="nameAndPhone !=null and nameAndPhone!='' ">
                and `name` LIKE CONCAT('%', #{nameAndPhone}, '%')
                or nick_name LIKE CONCAT('%', #{nameAndPhone}, '%')
                or phone LIKE CONCAT('%', #{nameAndPhone}, '%')
            </if>
        </where>
    </select>