Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
e6f3b2a1
Commit
e6f3b2a1
authored
Mar 08, 2024
by
李秀明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 巡检接口SQL参数修改
parent
54a5fdf7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
CheckController.java
...join/amos/patrol/business/controller/CheckController.java
+1
-1
dbTemplate_check.xml
...-patrol/src/main/resources/db/mapper/dbTemplate_check.xml
+2
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
View file @
e6f3b2a1
...
...
@@ -978,7 +978,7 @@ public class CheckController extends AbstractBaseController {
param
.
setUserId
(
userId
);
ReginParams
reginParams
=
getSelectedOrgInfo
();
param
.
setOrderBy
(
"checkDate desc"
);
param
.
setBizOrgCode
(
ObjectUtils
.
isEmpty
(
param
.
getBizOrgCode
())
?
reginParams
.
getPersonIdentity
().
getBizOrgCode
()
:
param
.
getBizOrgCode
());
//
param.setBizOrgCode(ObjectUtils.isEmpty(param.getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : param.getBizOrgCode());
CommonPageable
commonPageable
=
new
CommonPageable
();
commonPageable
.
setPageNumber
(
pageNumber
);
commonPageable
.
setPageSize
(
pageSize
);
...
...
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml
View file @
e6f3b2a1
...
...
@@ -438,7 +438,7 @@
FROM
`p_check` `a`
<trim
prefix=
"WHERE"
prefixOverrides=
"AND "
>
<if
test=
"userId!=null and userId!=''"
>
and
find_in_set(#{userId}, a.user_id) > 0
</if>
<if
test=
"userId!=null and userId!=''"
>
and
a.user_id = #{userId}
</if>
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
and a.org_code LIKE CONCAT(#{bizOrgCode},'%')
</if>
...
...
@@ -471,7 +471,7 @@
`p_check` `a`
<trim
prefix=
"WHERE"
prefixOverrides=
"AND "
>
`a`.`is_ok` != 1
<if
test=
"userId!=null and userId!=''"
>
and
find_in_set(#{userId}, a.user_id) > 0
</if>
<if
test=
"userId!=null and userId!=''"
>
and
a.user_id = #{userId}
</if>
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
and a.org_code LIKE CONCAT(#{bizOrgCode},'%')
</if>
...
...
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