From 5ef6ad3935af9b3b782de2467dd5d635b45b02e5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Feb 2024 15:15:54 +0800
Subject: [PATCH] 业委会功能bug修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 2 +-
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java | 1 +
src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java | 7 +++----
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java
index fdc8cb1..c098acc 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java
+++ b/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));
}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java b/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java
index 639618d..2c53fd4 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java
+++ b/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;
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index a3e9195..5ba1cd6 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/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>
<!--根据手机号查询对应账号和手机号的用户信息-->
--
Gitblit v1.9.3