ed0dc655e6732f15d30f399c0d460ad7b9fe42da..77c1b2e42b966f6ac3781efceb2cffdd590addec
2025-06-05 tj
1.1
77c1b2 对比 | 目录
2025-06-05 cloudroam
fix:用户查询
f7bb78 对比 | 目录
已修改4个文件
45 ■■■■ 文件已修改
src/main/java/com/mzl/flower/mapper/system/UserMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/system/UserService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/film/CommentPoExMapper.xml 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/mapper/system/UserMapper.java
@@ -6,6 +6,7 @@
import com.mzl.flower.dto.response.sms.SmsSelectVO;
import com.mzl.flower.dto.response.system.UserListDTO;
import com.mzl.flower.dto.response.system.UserListInfoDTO;
import com.mzl.flower.dto.security.UserDTO;
import com.mzl.flower.entity.system.User;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -29,4 +30,6 @@
    List<SmsSelectVO> getSelectList(@Param("idList") List<String> idList);
    List<UserListInfoDTO> searchUserInfo(Page page, @Param("condition") SearchUserDTO dto);
    List<User> getByIds(List<String> userIds);
}
src/main/java/com/mzl/flower/service/system/UserService.java
@@ -573,7 +573,7 @@
                        UpdateCustomerDTO updateCustomerDTO = new UpdateCustomerDTO();
                        updateCustomerDTO.setUserId(user.getId());
                        if (StringUtils.isNotBlank(dto.getPurePhoneNumber())) {
                            updateCustomerDTO.setName("花满芫-" + dto.getPurePhoneNumber().substring(dto.getPurePhoneNumber().length() - 4));
                            updateCustomerDTO.setName("影途-" + dto.getPurePhoneNumber().substring(dto.getPurePhoneNumber().length() - 4));
                        }
                        updateCustomerDTO.setIsMember(true);  // 会员
src/main/resources/application.yml
@@ -113,8 +113,8 @@
map:
  tengxun:
#    apiKey: GSBBZ-CJA3U-NNDVH-GE65N-6FIF6-ZGBCU
    apiKey: D7OBZ-FPLEZ-U4UXA-7LVCZ-P2XF7-ICFOH
#    apiKey: D7OBZ-FPLEZ-U4UXA-7LVCZ-P2XF7-ICFOH
    apiKey: SQEBZ-LQRKJ-PJOFP-DXIAX-YZUFH-Y4BVP
  # 新政区划接口url
    administrative_divisions_url : https://apis.map.qq.com/ws/district/v1/list?key=${map.tengxun.apiKey}&&struct_type=1
  gaode:
src/main/resources/mapper/film/CommentPoExMapper.xml
@@ -14,41 +14,41 @@
    </resultMap>
    <sql id="Base_Column_List">
        fs_comment.id, fs_comment.parent_id, fs_comment.content, fs_comment.film_id, fs_comment.`state`, fs_comment.deleted,
        fs_comment.create_by, fs_comment.create_time, fs_comment.update_time
        film_comments.id, film_comments.parent_id, film_comments.content, film_comments.film_id, film_comments.`state`, film_comments.deleted,
        film_comments.create_by, film_comments.create_time, film_comments.update_time
    </sql>
    <select id="selectLatestComments" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from fs_comment left join fs_article on fs_comment.film_id = fs_article.id
        where fs_comment.deleted = 0
        and fs_comment.state = 1
        and fs_article.state = 1
        and fs_article.deleted = 0
        order by fs_comment.id desc
        from film_comments left join film_works on film_comments.film_id = film_works.id  and film_works.status = 'published'
        and film_works.deleted = 0
        where film_comments.deleted = 0
        and film_comments.state = 1
        order by film_comments.id desc
    </select>
    <select id="getAllArticleComment" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from fs_comment left join fs_article on fs_comment.film_id = fs_article.id
        where fs_comment.deleted = 0
        and fs_comment.state = 1
        from film_comments left join fs_article on film_comments.film_id = fs_article.id
        where film_comments.deleted = 0
        and film_comments.state = 1
        and fs_article.state = 1
        and fs_comment.create_time between #{startTime} and #{endTime}
        and fs_comment.parent_id = 0
        and film_comments.create_time between #{startTime} and #{endTime}
        and film_comments.parent_id = 0
    </select>
    <select id="getAllCommentReply" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from fs_comment left join fs_article on fs_comment.film_id = fs_article.id
        where fs_comment.deleted = 0
        and fs_comment.state = 1
        from film_comments left join fs_article on film_comments.film_id = fs_article.id
        where film_comments.deleted = 0
        and film_comments.state = 1
        and fs_article.state = 1
        and fs_comment.create_time between #{startTime} and #{endTime}
        and fs_comment.parent_id != 0
        and film_comments.create_time between #{startTime} and #{endTime}
        and film_comments.parent_id != 0
    </select>
</mapper>