Commit e3bb1d0e authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/master'

parents 8b388963 82c048fe
...@@ -74,5 +74,5 @@ wx: ...@@ -74,5 +74,5 @@ wx:
corpid: wwbcb090af0dfe50e5 corpid: wwbcb090af0dfe50e5
corpsecret: 16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU corpsecret: 16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid: 1000010 agentid: 1000010
authUrl: https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin authUrl: https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName: https://test-wx.worfu.com domainName: https://wx.worfu.com
\ No newline at end of file \ No newline at end of file
...@@ -408,7 +408,9 @@ ...@@ -408,7 +408,9 @@
<select id="geNoPageList" resultMap="tDispatchInfoPreMap"> <select id="geNoPageList" resultMap="tDispatchInfoPreMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
,if(b.id is not null,'0','1') as CONTRACT_STATUS
FROM t_dispatch_info_pre a FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0'
<include refid="tDispatchInfoPre_other_where"/> <include refid="tDispatchInfoPre_other_where"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment