Commit 8a1047ad authored by 赵啸非's avatar 赵啸非

修改查询差集没有条件的时候sql异常

parent aa89175e
...@@ -25,6 +25,7 @@ import com.mortals.xhx.module.site.model.SiteEntity; ...@@ -25,6 +25,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.service.SiteService; import com.mortals.xhx.module.site.service.SiteService;
import com.mortals.xhx.utils.EncodeUtil; import com.mortals.xhx.utils.EncodeUtil;
import com.mortals.xhx.version.model.VersionEntity; import com.mortals.xhx.version.model.VersionEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -49,6 +50,7 @@ import static com.mortals.xhx.common.key.Constant.CUSTAPP_ROOT_PATH; ...@@ -49,6 +50,7 @@ import static com.mortals.xhx.common.key.Constant.CUSTAPP_ROOT_PATH;
* @date 2022-11-28 * @date 2022-11-28
*/ */
@Service("appService") @Service("appService")
@Slf4j
public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, Long> implements AppService { public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, Long> implements AppService {
@Autowired @Autowired
...@@ -68,6 +70,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -68,6 +70,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
protected void findAfter(AppEntity params, PageInfo pageInfo, Context context, List<AppEntity> list) throws AppException { protected void findAfter(AppEntity params, PageInfo pageInfo, Context context, List<AppEntity> list) throws AppException {
//排序 //排序
if (!ObjectUtils.isEmpty(params.getIdList())) { if (!ObjectUtils.isEmpty(params.getIdList())) {
log.info("请求的排序id列表:{}", JSON.toJSONString(params.getIdList()));
try { try {
//去除idlist中不存在的 //去除idlist中不存在的
Set<Long> idSet = list.stream().map(item -> item.getId()).collect(Collectors.toSet()); Set<Long> idSet = list.stream().map(item -> item.getId()).collect(Collectors.toSet());
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</trim> </trim>
)AS b ON a.matterNo = b.matterCode )AS b ON a.matterNo = b.matterCode
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where b.matterCode IS NULL and where b.matterCode IS NULL
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
<if test="condition.areaCode!=null and condition.areaCode!=''"> <if test="condition.areaCode!=null and condition.areaCode!=''">
and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR} and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</trim> </trim>
) AS b ON a.matterNo = b.matterCode ) AS b ON a.matterNo = b.matterCode
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where b.matterCode IS NULL and where b.matterCode IS NULL
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
<if test="condition.areaCode!=null and condition.areaCode!=''"> <if test="condition.areaCode!=null and condition.areaCode!=''">
and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR} and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
......
...@@ -19,7 +19,7 @@ Content-Type: application/json ...@@ -19,7 +19,7 @@ Content-Type: application/json
{ {
"siteId":1, "siteId":1,
"idList": [1,2,3,4], "idList": [2,10,5,14,13,3,7,9,1],
"type": 1, "type": 1,
"shelves": 1, "shelves": 1,
"page":1, "page":1,
......
...@@ -4,7 +4,6 @@ POST {{baseUrl}}/window/business/list ...@@ -4,7 +4,6 @@ POST {{baseUrl}}/window/business/list
Content-Type: application/json Content-Type: application/json
{ {
"siteBusinessId":58,
"page":1, "page":1,
"size":10 "size":10
} }
......
{ {
"portal-local": { "portal-local": {
"baseUrl": "http://127.0.0.1:17214/zwfw" "baseUrl": "http://127.0.0.1:17212/zwfw"
}, },
"portal-dev": { "portal-dev": {
"baseUrl": "http://192.168.0.98:11072/zwfw" "baseUrl": "http://192.168.0.98:11072/zwfw"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment