From 3360a7e3e0f9b183817bd429e813f9335f08c4a9 Mon Sep 17 00:00:00 2001
From: goupan <goupan@chinapopin.com>
Date: 星期一, 08 四月 2024 23:40:59 +0800
Subject: [PATCH] 修改bug
---
rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java | 2 +-
rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java | 2 +-
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java | 11 ++++++-----
roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml | 11 +++++++----
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java b/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java
index c88009b..23ffbe8 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java
@@ -46,7 +46,7 @@
@Resource
private IStoreAppointmentService storeAppointmentService;
- @ApiOperation("banner列表 ")
+ @ApiOperation("banner列表")
@ApiImplicitParam(value = "类型：1首页、2课程、3咨询",name = "type",dataTypeClass = Integer.class)
@GetResource(name = "banner列表", path = "/banner")
public ResponseData<Banner> banner(Integer type) {
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java b/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java
index 0fcc610..a90a41a 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java
@@ -58,7 +58,7 @@
PageFactory.page(pageNo, pageSize),
Wrappers.<PsychologicalColumn>lambdaQuery()
.eq(PsychologicalColumn::getIsDelete,DeleteEnum.NOT_DELETE.getCode())
- .like(StrUtil.isNotBlank(title), PsychologicalColumn::getArticleTitle,DeleteEnum.NOT_DELETE.getCode())
+ .like(StrUtil.isNotBlank(title), PsychologicalColumn::getArticleTitle, title)
.orderByDesc(PsychologicalColumn::getReleaseTime)
);
return new SuccessResponseData<>(PageResultFactory.createPageResult(page));
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
index 9cfe666..1572b18 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
@@ -301,12 +301,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "分页：第几页（从1开始）", dataTypeClass = Integer.class, paramType = "query"),
@ApiImplicitParam(name = "pageSize", value = "分页：每页大小（默认10）", dataTypeClass = Integer.class, paramType = "query"),
- @ApiImplicitParam(name = "title", value = "帮助内容", dataTypeClass = Integer.class, paramType = "query")
+ @ApiImplicitParam(name = "title", value = "标题", dataTypeClass = String.class, paramType = "query"),
+ @ApiImplicitParam(name = "content", value = "内容", dataTypeClass = String.class, paramType = "query")
} )
- public ResponseData<PageResult<Help>> page(Integer pageNo, Integer pageSize,String title) {
- LambdaQueryWrapper<Help> lambdaQueryWrapper = new LambdaQueryWrapper<Help>().eq(Help::getIsDelete,false)
- .orderByAsc(Help::getSort);
- lambdaQueryWrapper.like(StrUtil.isNotBlank(title),Help::getTitle,title).or().like(StrUtil.isNotBlank(title),Help::getContent,title);
+ public ResponseData<PageResult<Help>> page(Integer pageNo, Integer pageSize, String title, String content) {
+ LambdaQueryWrapper<Help> lambdaQueryWrapper = new LambdaQueryWrapper<Help>().eq(Help::getIsDelete, false).orderByAsc(Help::getSort);
+ lambdaQueryWrapper.like(StrUtil.isNotBlank(title), Help::getTitle, title);
+ lambdaQueryWrapper.like(StrUtil.isNotBlank(content), Help::getContent, content);
Page<Help> page = this.helpService.page(PageFactory.page(pageNo, pageSize), lambdaQueryWrapper);
return new SuccessResponseData<>(PageResultFactory.createPageResult(page));
}
diff --git a/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml b/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml
index e817a31..ae34329 100644
--- a/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml
+++ b/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml
@@ -4,11 +4,11 @@
<sql id="getWorkerByLineStatusAndPostType">
toc_customer o
- LEFT JOIN im_user_status im ON o.customer_id = im.userid
+ LEFT JOIN im_user_status ius ON o.customer_id = ius.userid
<where>
AND o.status_flag = 1
<if test="lineStatus != null and lineStatus != ''">
- AND im.`status` = #{lineStatus}
+ AND ius.`status` = #{lineStatus}
</if>
<if test="postType != null">
AND FIND_IN_SET( #{postType}, post_types )
@@ -29,11 +29,11 @@
<select id="randomWorkerByLineStatusAndPostNeWorkerId" resultType="cn.stylefeng.roses.kernel.customer.modular.entity.Customer">
SELECT customer_id FROM toc_customer o
- LEFT JOIN im_user_status im ON o.customer_id = im.userid
+ LEFT JOIN im_user_status ius ON o.customer_id = ius.userid
<where>
AND o.status_flag = 1
<if test="lineStatus != null and lineStatus != ''">
- AND im.`status` = #{lineStatus}
+ AND ius.`status` = #{lineStatus}
</if>
<if test="postType != null">
AND FIND_IN_SET( #{postType}, post_types )
@@ -41,6 +41,9 @@
<if test="postId != null">
AND FIND_IN_SET( #{postId}, post_ids )
</if>
+ <if test="workStatus != null">
+ AND o.work_status = #{workStatus}
+ </if>
<if test="eqWorkerIdList != null and eqWorkerIdList.size != 0">
AND o.customer_id IN
<foreach collection="eqWorkerIdList" item="item" open="(" separator="," close=")">
--
Gitblit v1.7.1