Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
8a1047ad
Commit
8a1047ad
authored
Mar 01, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改查询差集没有条件的时候sql异常
parent
aa89175e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
5 deletions
+7
-5
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
...m/mortals/xhx/module/app/service/impl/AppServiceImpl.java
+3
-0
base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml
...c/main/resources/sqlmap/module/matter/MatterMapperExt.xml
+2
-2
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
...c/test/java/com/mortals/httpclient/app/AppController.http
+1
-1
base-manager/src/test/java/com/mortals/httpclient/window/WindowBusinessController.http
...m/mortals/httpclient/window/WindowBusinessController.http
+0
-1
portal-manager/src/test/java/com/mortals/httpclient/http-client.env.json
...src/test/java/com/mortals/httpclient/http-client.env.json
+1
-1
No files found.
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @
8a1047ad
...
...
@@ -25,6 +25,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
import
com.mortals.xhx.module.site.service.SiteService
;
import
com.mortals.xhx.utils.EncodeUtil
;
import
com.mortals.xhx.version.model.VersionEntity
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -49,6 +50,7 @@ import static com.mortals.xhx.common.key.Constant.CUSTAPP_ROOT_PATH;
* @date 2022-11-28
*/
@Service
(
"appService"
)
@Slf4j
public
class
AppServiceImpl
extends
AbstractCRUDServiceImpl
<
AppDao
,
AppEntity
,
Long
>
implements
AppService
{
@Autowired
...
...
@@ -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
{
//排序
if
(!
ObjectUtils
.
isEmpty
(
params
.
getIdList
()))
{
log
.
info
(
"请求的排序id列表:{}"
,
JSON
.
toJSONString
(
params
.
getIdList
()));
try
{
//去除idlist中不存在的
Set
<
Long
>
idSet
=
list
.
stream
().
map
(
item
->
item
.
getId
()).
collect
(
Collectors
.
toSet
());
...
...
base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml
View file @
8a1047ad
...
...
@@ -15,7 +15,7 @@
</trim>
)AS b ON a.matterNo = b.matterCode
<trim
suffixOverrides=
"where"
suffix=
""
>
where b.matterCode IS NULL
and
where b.matterCode IS NULL
<trim
prefixOverrides=
"and"
prefix=
""
>
<if
test=
"condition.areaCode!=null and condition.areaCode!=''"
>
and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
...
...
@@ -47,7 +47,7 @@
</trim>
) AS b ON a.matterNo = b.matterCode
<trim
suffixOverrides=
"where"
suffix=
""
>
where b.matterCode IS NULL
and
where b.matterCode IS NULL
<trim
prefixOverrides=
"and"
prefix=
""
>
<if
test=
"condition.areaCode!=null and condition.areaCode!=''"
>
and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
...
...
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @
8a1047ad
...
...
@@ -19,7 +19,7 @@ Content-Type: application/json
{
"siteId":1,
"idList": [
1,2,3,4
],
"idList": [
2,10,5,14,13,3,7,9,1
],
"type": 1,
"shelves": 1,
"page":1,
...
...
base-manager/src/test/java/com/mortals/httpclient/window/WindowBusinessController.http
View file @
8a1047ad
...
...
@@ -4,7 +4,6 @@ POST {{baseUrl}}/window/business/list
Content-Type: application/json
{
"siteBusinessId":58,
"page":1,
"size":10
}
...
...
portal-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @
8a1047ad
{
"portal-local"
:
{
"baseUrl"
:
"http://127.0.0.1:1721
4
/zwfw"
"baseUrl"
:
"http://127.0.0.1:1721
2
/zwfw"
},
"portal-dev"
:
{
"baseUrl"
:
"http://192.168.0.98:11072/zwfw"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment