Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
9905063c
Commit
9905063c
authored
Nov 03, 2021
by
季圣华
Browse files
解决用户被禁用之后单据不展示的bug
parent
df6a80c3
Changes
3
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
View file @
9905063c
...
...
@@ -13,7 +13,7 @@
select ah.*, s.supplier OrganName, p.Name HandsPersonName, u.username userName, a.Name AccountName
from jsh_account_head ah
left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
left join jsh_user u on ah.creator=u.id and ifnull(u.Status,'0') ='
0
'
left join jsh_user u on ah.creator=u.id and ifnull(u.Status,'0')
!
='
1
'
left join jsh_person p on ah.hands_person_id=p.id and ifnull(p.delete_Flag,'0') !='1'
left join jsh_account a on ah.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'
where 1=1
...
...
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View file @
9905063c
...
...
@@ -50,7 +50,7 @@
select distinct dh.*, s.supplier OrganName, u.username userName, a.name AccountName
from jsh_depot_head dh
left join jsh_supplier s on dh.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
left join jsh_user u on dh.creator=u.id and ifnull(u.Status,'0') ='
0
'
left join jsh_user u on dh.creator=u.id and ifnull(u.Status,'0')
!
='
1
'
left join jsh_account a on dh.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'
left join jsh_depot_item di on dh.id = di.header_id and ifnull(di.delete_flag,'0') !='1'
left join jsh_material m on di.material_id = m.id and ifnull(m.delete_flag,'0') !='1'
...
...
@@ -537,7 +537,7 @@
select distinct dh.*, s.supplier OrganName, u.username userName
from jsh_depot_head dh
left join jsh_supplier s on dh.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
left join jsh_user u on dh.creator=u.id and ifnull(u.Status,'0') ='
0
'
left join jsh_user u on dh.creator=u.id and ifnull(u.Status,'0')
!
='
1
'
left join jsh_depot_item di on dh.id = di.header_id and ifnull(di.delete_flag,'0') !='1'
left join jsh_material m on di.material_id = m.id and ifnull(m.delete_flag,'0') !='1'
where 1=1
...
...
jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml
View file @
9905063c
...
...
@@ -8,7 +8,7 @@
<select
id=
"selectByConditionLog"
parameterType=
"com.jsh.erp.datasource.entities.LogExample"
resultMap=
"ResultExMap"
>
select l.*,u.username userName
FROM jsh_log l
left join jsh_user u on l.user_id = u.id and ifnull(u.
s
tatus,'0')
not in('1','2')
left join jsh_user u on l.user_id = u.id and ifnull(u.
S
tatus,'0')
!='1'
where 1=1
<if
test=
"operation != null"
>
<bind
name=
"bindOperation"
value=
"'%'+operation+'%'"
/>
...
...
@@ -43,7 +43,7 @@
SELECT
COUNT(1)
FROM jsh_log l
left join jsh_user u on l.user_id = u.id and ifnull(u.
s
tatus,'0')
not in('1','2')
left join jsh_user u on l.user_id = u.id and ifnull(u.
S
tatus,'0')
!='1'
WHERE 1=1
<if
test=
"operation != null"
>
<bind
name=
"bindOperation"
value=
"'%'+operation+'%'"
/>
...
...
Write
Preview
Supports
Markdown
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