linwei
2024-02-19 5ef6ad3935af9b3b782de2467dd5d635b45b02e5
业委会功能bug修复
3 files modified
10 ■■■■ changed files
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java
@@ -99,6 +99,7 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入ownersCommittee")
    public R update(@Valid @RequestBody OwnersCommitteeEntity ownersCommittee) {
        // 负责人修改了需要去更新负责人
        return R.status(ownersCommitteeService.updateById(ownersCommittee));
    }
src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java
@@ -58,7 +58,7 @@
    /** 建立时间 */
    @ApiModelProperty(value = "建立时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @TableField("establish_time")
    private Date establishTime;
@@ -119,13 +119,13 @@
    /** 开始时间 */
    @ApiModelProperty(value = "开始时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @TableField("start_time")
    private Date startTime;
    /** 截止时间 */
    @ApiModelProperty(value = "截止时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @TableField("end_time")
    private Date endTime;
@@ -169,6 +169,5 @@
    /** 0否 1是 */
    @ApiModelProperty(value = "0否 1是", example = "")
    @TableField("delete_flag")
    @TableLogic
    private Integer deleteFlag;
}
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -98,7 +98,7 @@
            jd.id  = #{districtId}
          and bu.is_deleted = '0'
          and jh.is_deleted = '0'
          and jh.role_type = '1'
    </select>
    <!--根据手机号查询对应账号和手机号的用户信息-->