From b033044119ea8a04ccac5334a82b14dbc09ab83a Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Wed, 6 Aug 2025 14:24:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=84=E8=AE=BA=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E8=AF=84=E8=AE=BA=202=E3=80=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityComment/entity/CommunityComment.java | 2 ++ .../modules/api/communityController/IndexController.java | 2 +- .../modules/api/service/impl/CommunityServiceImpl.java | 8 +++++++- .../jeecg/modules/api/service/impl/UserInfoServiceImpl.java | 13 +++++++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityComment/entity/CommunityComment.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityComment/entity/CommunityComment.java index d1e81ce..0f94d7b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityComment/entity/CommunityComment.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityComment/entity/CommunityComment.java @@ -40,12 +40,14 @@ public class CommunityComment implements Serializable { private java.lang.String createBy; /**创建日期*/ @ApiModelProperty(value = "创建日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private java.util.Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新日期*/ @ApiModelProperty(value = "更新日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private java.util.Date updateTime; /**文字描述*/ @Excel(name = "文字描述", width = 15) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/IndexController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/IndexController.java index 58be6b0..2249ee5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/IndexController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/IndexController.java @@ -28,7 +28,7 @@ public class IndexController { /******************************************************************************************************************/ //获取banner图列表 - @ApiOperation(value="首页-获取banner图列表", notes="type：0-首页") + @ApiOperation(value="首页-获取banner图列表", notes="type：0-首页 1-木邻说 2-木邻见") @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET}) public Result queryBannerList(CommunityBanner communityBanner, PageBean pageBean){ return indexService.queryBannerList(communityBanner, pageBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/CommunityServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/CommunityServiceImpl.java index df9c085..b24b4cf 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/CommunityServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/CommunityServiceImpl.java @@ -78,8 +78,14 @@ public class CommunityServiceImpl implements CommunityService { //审核状态为已经通过 query.eq(CommunityPost::getStatus, "1"); + //用户审核没有通过的帖子也能被用户自己查看 if(null != hanHaiMember){ - query.or().eq(CommunityPost::getUserId, hanHaiMember.getId()); + String userId = hanHaiMember.getId(); + query.or( + q -> q + .eq(CommunityPost::getUserId, userId) + .eq(CommunityPost::getType, communityPost.getType()) + ); } //按照创建时间降序排列 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java index 09d55cb..d2f109c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java @@ -60,8 +60,8 @@ public class UserInfoServiceImpl implements UserInfoService { public Result updateUserInfo(String token,String nickName,String phone,String headImage,String address){ log.info("开始修改个人信息"); //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); try{ //用户昵称不能为空 @@ -77,6 +77,15 @@ public class UserInfoServiceImpl implements UserInfoService { log.error("地址不能为空"); return Result.error("地址不能为空"); } + if(StringUtils.isNotEmpty(phone)){ + List list = hanHaiMemberService + .lambdaQuery() + .eq(HanHaiMember::getPhone, phone) + .list(); + if(null != list){ + return Result.error("该号码已经有人使用，不能重复填写"); + } + } hanHaiMember.setNickName(nickName); hanHaiMember.setPhone(phone);