purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决用户被禁用之后单据不展示的bug

Browse Source
This commit is contained in:
季圣华
2021-11-03 00:00:21 +08:00
parent df6a80c390
commit 9905063c80
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
View File

@@ -13,7 +13,7 @@
select ah.*, s.supplier OrganName, p.Name HandsPersonName, u.username userName, a.Name AccountName select ah.*, s.supplier OrganName, p.Name HandsPersonName, u.username userName, a.Name AccountName
from jsh_account_head ah 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_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_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' left join jsh_account a on ah.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'
where 1=1 where 1=1

4
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -50,7 +50,7 @@
select distinct dh.*, s.supplier OrganName, u.username userName, a.name AccountName select distinct dh.*, s.supplier OrganName, u.username userName, a.name AccountName
from jsh_depot_head dh 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_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_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_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' 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 select distinct dh.*, s.supplier OrganName, u.username userName
from jsh_depot_head dh 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_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_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' left join jsh_material m on di.material_id = m.id and ifnull(m.delete_flag,'0') !='1'
where 1=1 where 1=1

4
jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml
View File

@@ -8,7 +8,7 @@
<select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap"> <select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap">
select l.*,u.username userName select l.*,u.username userName
FROM jsh_log l FROM jsh_log l
left join jsh_user u on l.user_id = u.id and ifnull(u.status,'0') not in('1','2') left join jsh_user u on l.user_id = u.id and ifnull(u.Status,'0') !='1'
where 1=1 where 1=1
<if test="operation != null"> <if test="operation != null">
<bind name="bindOperation" value="'%'+operation+'%'"/> <bind name="bindOperation" value="'%'+operation+'%'"/>
@@ -43,7 +43,7 @@
SELECT SELECT
COUNT(1) COUNT(1)
FROM jsh_log l FROM jsh_log l
left join jsh_user u on l.user_id = u.id and ifnull(u.status,'0') not in('1','2') left join jsh_user u on l.user_id = u.id and ifnull(u.Status,'0') !='1'
WHERE 1=1 WHERE 1=1
<if test="operation != null"> <if test="operation != null">
<bind name="bindOperation" value="'%'+operation+'%'"/> <bind name="bindOperation" value="'%'+operation+'%'"/>