Merge branch 'test' into 'master'

罗yu 元桥

2021-04-28 6c3dcdcb89e181aac47e60a001dbe9e8921c8e79

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -161,7 +161,7 @@
            "from sys_user u\n" +
            "left join com_act a on u.community_id=a.community_id\n" +
            " where\n" +
            "u.type=1\n" +
            "u.type=1 and u.community_id is not null \n" +
            "<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != &quot;&quot;'>" +
            "and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
            " </if> " +
@@ -317,16 +317,16 @@
            "FROM\n" +
            "\t com_pb_member_role a \n" +
            "WHERE\n" +
            "\t a.phone = #{phone}")
    Integer selectCountMemberRole(@Param("phone")String phone);
            "\t a.phone = #{phone} and community_id=#{userCommunityId} ")
    Integer selectCountMemberRole(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
    
    @Select("SELECT\n" +
            "\t COUNT(a.id)\n" +
            "FROM\n" +
            "\t com_pb_service_team a \n" +
            "WHERE\n" +
            "\t a.phone = #{phone}")
    Integer selectCountTeam(@Param("phone")String phone);
            "\t a.phone = #{phone} and community_id=#{userCommunityId} ")
    Integer selectCountTeam(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
    
    
    @Update("update com_pb_member_role u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}")
@@ -349,9 +349,9 @@
    void deleteStoreByPhoneAndStatus(@RequestParam("phone") String phone);

    @Select("update sys_user set" +
            " card_photo_front = #{userArchivesVO.cardPhotoFront}" +
            "and card_photo_back = #{userArchivesVO.cardPhotoBack}" +
            "and family_book = #{userArchivesVO.familyBook}" +
            " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
            ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
            ",family_book = #{userArchivesVO.familyBook} \n" +
            " where user_id = #{userArchivesVO.userId}")
    void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);