Browse Source

修改个人详情、成员、个人发表模糊查询出现的问题

Alex 4 years ago
parent
commit
43d50c6c96

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbMyProfileController.java

@@ -58,10 +58,10 @@ public class TbMyProfileController extends BaseController {
             lqw.eq(TbMyProfile::getAppUserId ,tbMyProfile.getAppUserId());
         }
         if (StringUtils.isNotBlank(tbMyProfile.getTitle())){
-            lqw.eq(TbMyProfile::getTitle ,tbMyProfile.getTitle());
+            lqw.like(TbMyProfile::getTitle ,tbMyProfile.getTitle());
         }
         if (StringUtils.isNotBlank(tbMyProfile.getCotents())){
-            lqw.eq(TbMyProfile::getCotents ,tbMyProfile.getCotents());
+            lqw.like(TbMyProfile::getCotents ,tbMyProfile.getCotents());
         }
         List<TbMyProfile> list = iTbMyProfileService.list(lqw);
         return getDataTable(list);

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -203,6 +203,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         }
         lqw.eq(AppMemberVo::getFamilyId, memberVo.getFamilyId());
         lqw.isNotNull(AppMemberVo::getParentId);
+        lqw.eq(StringUtils.isNotBlank(memberVo.getGender()),AppMemberVo::getGender,memberVo.getGender());
         if (StringUtils.isNotBlank(memberVo.getSearchValue())) {
             lqw.and(
                     i -> i.like(AppMemberVo::getName,memberVo.getSearchValue()).or()
@@ -230,6 +231,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         }
         lqw.eq(AppMemberVo::getFamilyId, memberVo.getFamilyId());
         lqw.eq(AppMemberVo::getStatus,"2");
+        lqw.eq(StringUtils.isNotBlank(memberVo.getGender()), AppMemberVo::getGender,memberVo.getGender());
         if (StringUtils.isNotBlank(memberVo.getSearchValue())) {
             lqw.and(
                     i -> i.like(AppMemberVo::getName,memberVo.getSearchValue()).or()

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbMyPublishServiceImpl.java

@@ -87,6 +87,10 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
         if (StringUtils.isNotBlank(tbMyPublish.getDeleted())){
             lqw.eq(TbMyPublish::getDeleted ,tbMyPublish.getDeleted());
         }
+        if (StringUtils.isNotBlank(tbMyPublish.getBeginTime()) &&
+                StringUtils.isNotBlank(tbMyPublish.getEndTime())) {
+            lqw.between(TbMyPublish::getCreateTime, tbMyPublish.getBeginTime(), tbMyPublish.getEndTime());
+        }
         startPage();
         List<TbMyPublish> list = baseMapper.pageList(lqw);
         if (list.size() <= 0) {