Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-smart
Overview
Overview
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
platform
hg-smart
Commits
4f1b8139
Commit
4f1b8139
authored
Jul 09, 2024
by
wuwenlong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
组织机构过滤已删除的数据bugfix
parent
36762c5d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
HGXSOrg.xml
src/main/java/com/baosight/hggp/hg/xs/sql/HGXSOrg.xml
+6
-6
No files found.
src/main/java/com/baosight/hggp/hg/xs/sql/HGXSOrg.xml
View file @
4f1b8139
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
) T2,
) T2,
${platSchema}.TXSOG01 T3
${platSchema}.TXSOG01 T3
LEFT JOIN ${platSchema}.TXSOG01 T5 ON T3.FACTORY_CODE = T5.ORG_ID
LEFT JOIN ${platSchema}.TXSOG01 T5 ON T3.FACTORY_CODE = T5.ORG_ID
WHERE
1=1
WHERE
T3.IS_DELETED = 0
AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
AND T3.ORG_ID != 'root'
AND T3.ORG_ID != 'root'
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
...
@@ -125,7 +125,7 @@
...
@@ -125,7 +125,7 @@
where @CODES is not null
where @CODES is not null
) T2,
) T2,
${platSchema}.TXSOG01 T3
${platSchema}.TXSOG01 T3
WHERE
1=1
WHERE
T3.IS_DELETED = 0
AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
ORG_TYPE = #orgType#
ORG_TYPE = #orgType#
...
@@ -143,7 +143,7 @@
...
@@ -143,7 +143,7 @@
ORG_ID as "orgId",
ORG_ID as "orgId",
ORG_CNAME as "orgCname"
ORG_CNAME as "orgCname"
FROM ${platSchema}.TXSOG01
FROM ${platSchema}.TXSOG01
WHERE
1=1
WHERE
T3.IS_DELETED = 0
AND ORG_TYPE != 'org'
AND ORG_TYPE != 'org'
<include
refid=
"condition"
/>
<include
refid=
"condition"
/>
<include
refid=
"customCondition"
/>
<include
refid=
"customCondition"
/>
...
@@ -191,7 +191,7 @@
...
@@ -191,7 +191,7 @@
) T2,
) T2,
${platSchema}.TXSOG01 T3
${platSchema}.TXSOG01 T3
LEFT JOIN ${platSchema}.TXSOG01 T5 ON T3.FACTORY_CODE = T5.ORG_ID
LEFT JOIN ${platSchema}.TXSOG01 T5 ON T3.FACTORY_CODE = T5.ORG_ID
WHERE
1=1
WHERE
T3.IS_DELETED = 0
AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
AND T3.ORG_TYPE IN ('prodGroup', 'cutGroup')
AND T3.ORG_TYPE IN ('prodGroup', 'cutGroup')
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
...
@@ -205,7 +205,7 @@
...
@@ -205,7 +205,7 @@
from ${platSchema}.txsog02 a
from ${platSchema}.txsog02 a
join ${platSchema}.xs_user b on a.USER_ID=b.USER_ID
join ${platSchema}.xs_user b on a.USER_ID=b.USER_ID
join ${platSchema}.txsog01 c on c.ORG_ID = a.ORG_ID and c.IS_DELETED = 0
join ${platSchema}.txsog01 c on c.ORG_ID = a.ORG_ID and c.IS_DELETED = 0
where
1=1
and c.ORG_TYPE = 'prodGroup'
where
c.IS_DELETED = 0
and c.ORG_TYPE = 'prodGroup'
<isNotEmpty
prepend=
" AND "
property=
"userId"
>
<isNotEmpty
prepend=
" AND "
property=
"userId"
>
b.USER_ID = #userId#
b.USER_ID = #userId#
</isNotEmpty>
</isNotEmpty>
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
A.COMPANY_NAME AS "companyName",
A.COMPANY_NAME AS "companyName",
A.PARENT_ORG_ID as "parentOrgId"
A.PARENT_ORG_ID as "parentOrgId"
FROM ${platSchema}.TXSOG01 A, ${platSchema}.TXSOG02 B, ${platSchema}.XS_USER C
FROM ${platSchema}.TXSOG01 A, ${platSchema}.TXSOG02 B, ${platSchema}.XS_USER C
WHERE
1=1
WHERE
A.IS_DELETED = 0
AND A.ORG_ID = B.ORG_ID
AND A.ORG_ID = B.ORG_ID
AND B.USER_ID = C.USER_ID
AND B.USER_ID = C.USER_ID
AND C.LOGIN_NAME = #loginName#
AND C.LOGIN_NAME = #loginName#
...
...
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