Browse Source

1、评论补充可以查看自己的所有评论

2、用户电话号码唯一校验
master
Aug 1 month ago
parent
commit
b033044119
4 changed files with 21 additions and 4 deletions
  1. +2
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityComment/entity/CommunityComment.java
  2. +1
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/IndexController.java
  3. +7
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/CommunityServiceImpl.java
  4. +11
    -2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java

+ 2
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityComment/entity/CommunityComment.java View File

@ -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)


+ 1
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/IndexController.java View File

@ -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);


+ 7
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/CommunityServiceImpl.java View File

@ -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())
);
}
//按照创建时间降序排列


+ 11
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java View File

@ -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<HanHaiMember> list = hanHaiMemberService
.lambdaQuery()
.eq(HanHaiMember::getPhone, phone)
.list();
if(null != list){
return Result.error("该号码已经有人使用,不能重复填写");
}
}
hanHaiMember.setNickName(nickName);
hanHaiMember.setPhone(phone);


Loading…
Cancel
Save