linwei
2024-01-12 7dbc224fddba144063f52cab6ee911b7c63184ca
议事查询参与用户优化
3 files modified
21 ■■■■ changed files
src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/discuss/entity/UserTopicsEntity.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml 12 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java
@@ -29,7 +29,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
import org.springblade.modules.discuss.entity.UserTopicsEntity;
@@ -147,8 +146,11 @@
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(userTopicsService.removeByIds(Func.toLongList(ids)));
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam Integer ids) {
        UserTopicsEntity userTopicsEntity = new UserTopicsEntity();
        userTopicsEntity.setDeleteFlag(1);
        userTopicsEntity.setId(ids);
        return R.status(userTopicsService.updateById(userTopicsEntity));
    }
    /**
src/main/java/org/springblade/modules/discuss/entity/UserTopicsEntity.java
@@ -77,7 +77,6 @@
     */
    @ApiModelProperty(value = "0否 1是", example = "")
    @TableField("delete_flag")
    @TableLogic
    private Integer deleteFlag;
    /**
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -32,7 +32,10 @@
    <select id="selectUserTopicsPage" resultMap="userTopicsResultMap">
        SELECT
        jut.article_id,
        jut.id,
        jut.delete_flag,
        jut.signature_path,
        jut.create_time,
        bu.avatar,
        bu.`name`,
        bu.phone,
@@ -45,13 +48,20 @@
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
        <where>
            <if test="userTopics.id != null ">and jut.id = #{userTopics.id}</if>
            <if test="userTopics.name != null and userTopics.name != ''">
                and bu.name like concat('%',#{userTopics.name},'%')
            </if>
            <if test="userTopics.phone != null and userTopics.phone != ''">
                and bu.phone like concat('%',#{userTopics.phone},'%')
            </if>
            <if test="userTopics.userId != null ">and jut.user_id = #{userTopics.userId}</if>
            <if test="userTopics.topicsId != null ">and jut.topics_id = #{userTopics.topicsId}</if>
            <if test="userTopics.createTime != null ">and jut.create_time = #{userTopics.createTime}</if>
            <if test="userTopics.updateTime != null ">and jut.update_time = #{userTopics.updateTime}</if>
            <if test="userTopics.deleteFlag != null ">and jut.delete_flag = #{userTopics.deleteFlag}</if>
            <if test="userTopics.articleId != null ">and jut.article_id = #{userTopics.articleId}
                GROUP BY jut.article_id, jut.signature_path,
                and jut.delete_flag = 0
                GROUP BY jut.article_id, jut.signature_path,jut.create_time,jut.id,jut.delete_flag,
                bu.avatar,
                bu.`name`,
                bu.phone,