bug修改

101captain

2022-06-17 d5c76a9f7a73c613d580e2ac165947f064dbf058

bug修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -301,7 +301,7 @@
    @ApiOperation(value = "查询当前用户党员信息")
    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("type")Integer type){
        return partyBuildingService.getPartyMember(this.getUserId(),type);
        return partyBuildingService.getPartyMember(this.getLoginUserInfo().getPhone(),type);
    }
    @ApiOperation(value = "查询报道单位详情")
    @GetMapping("/comPbCheckUnit/detailByPhone")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -613,7 +613,7 @@


    @GetMapping("/partybuildIng/getPartyMember")
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type);
    public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type);

    @GetMapping("/partybuildIng/memberDetail")
    public R memberDetail(@RequestParam("id")Long id);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -782,8 +782,8 @@
    }

    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(userId,type);
    public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(phone,type);
    }
    @GetMapping("/memberDetail")
    public R memberDetail(@RequestParam("id")Long id){

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -195,5 +195,5 @@
     */
    PartyBuildingMemberVO getDetailByApp(Long id);

    PartyBuildingMemberVO selectDetail(@Param("userId") Long userId,@Param("type")Integer type);
    PartyBuildingMemberVO selectDetail(@Param("phone") String phone,@Param("type")Integer type);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java

@@ -251,7 +251,7 @@

    R getPagePbMember(PartyBuildingMemberVO partyBuildingMemberVO);

    R getPartyMember(Long userId,Integer type);
    R getPartyMember(String phone,Integer type);

    R memberDetail(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -1117,9 +1117,9 @@
    }

    @Override
    public R getPartyMember(Long userId,Integer type) {
    public R getPartyMember(String phone,Integer type) {

        return R.ok(comPbMemberDAO.selectDetail(userId,type));
        return R.ok(comPbMemberDAO.selectDetail(phone,type));
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml

@@ -732,8 +732,8 @@
                 left join com_pb_check_unit t1 on t.check_unit_id = t1.id
                 left join com_mng_village t2 on t.village_id = t2.village_id
                 left join com_act t4 on t.community_id = t4.community_id
        where t.user_id = #{userId}
          and t.type = #{type}
        where t.phone = #{phone}
          and t.type = #{type} limit 1
    </select>
    <select id="getDetailByApp" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
        select t.*,