lidongdong
2023-11-24 d331c5475f0b07f36161a4464d92e32b6913b4e9
后台增加用户搜索列表
7个文件已修改
49 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConvenientMerchantApi.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConvenientMerchantDao.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConvenientMerchantServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightComConvenientMerchantsMapper.xml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -383,6 +383,13 @@
                            @RequestParam("phoneOrname") String phoneOrname);
    @GetMapping("/selectUserListB")
    public R selectUserListB(@RequestParam("communityId") String communityId,
                             @RequestParam("phoneOrname") String phoneOrname);
    @GetMapping("/FightConvenient/selectUserBind")
    public R selectUserBind(@RequestParam("communityId") String communityId,
                            @RequestParam("userId") String userId);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java
@@ -340,7 +340,7 @@
    @GetMapping("/selectUserList")
    public R selectUserList(@RequestParam("phoneOrname") String phoneOrname)
    {
        return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname);
        return newStriveForFeign.selectUserListB(getCommunityId()+"",phoneOrname);
    }
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConvenientMerchantApi.java
@@ -87,6 +87,14 @@
        return merchantService.selectUserList(communityId,phoneOrname);
    }
    @GetMapping("/selectUserListB")
    public R selectUserListB(@RequestParam("communityId") String communityId,
                            @RequestParam("phoneOrname") String phoneOrname)
    {
        return merchantService.selectUserListB(communityId,phoneOrname);
    }
    @GetMapping("/selectUserBind")
    public R selectUserBind(@RequestParam("communityId") String communityId,
                            @RequestParam("userId") String userId)
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConvenientMerchantDao.java
@@ -70,6 +70,10 @@
                                   @Param("phoneOrname") String phoneOrname);
    List<SysUserVO> selectUserListB(@Param("communityId") String communityId,
                                   @Param("phoneOrname") String phoneOrname);
    String selectUserBind(@Param("communityId") String communityId,
                          @Param("userId") String userId);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java
@@ -60,6 +60,8 @@
    R selectUserList(String communityId,String phoneOrname);
    R selectUserListB(String communityId,String phoneOrname);
    R selectUserBind(String communityId, String userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConvenientMerchantServiceImpl.java
@@ -81,6 +81,11 @@
    }
    @Override
    public R selectUserListB(String communityId, String phoneOrname) {
        return R.ok(baseMapper.selectUserListB(communityId,phoneOrname));
    }
    @Override
    public R selectUserBind(String communityId, String userId) {
        return R.ok(baseMapper.selectUserBind(communityId,userId));
    }
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightComConvenientMerchantsMapper.xml
@@ -302,6 +302,27 @@
    </select>
    <select id="selectUserListB" resultType="com.panzhihua.common.model.vos.user.SysUserVO">
        select su.user_id,su.phone,su.nick_name,su.name,su.community_id
        from sys_user as su
        <where>
            1=1
            and su.app_id='wx118de8a734d269f0'
            <if test="communityId!=null and communityId !='' ">
                and su.community_id=#{communityId}
            </if>
            <if test="phoneOrname!=null and phoneOrname !=''">
                and (su.name like concat ('%',#{phoneOrname},'%') or
                su.phone like concat ('%',#{phoneOrname},'%') or
                su.nick_name like concat ('%',#{phoneOrname},'%')
                )
            </if>
        </where>
    </select>
    <select id="selectUserBind" resultType="String">
        select id from new_fight_com_convenient_merchants
        <where>