Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api
This commit is contained in:
commit
a5a0230d7f
|
|
@ -407,7 +407,7 @@
|
|||
</if>
|
||||
</if>
|
||||
and ( m.SIGNUSERID = #{customParamMap.userId}
|
||||
or (m.currentNodeOrBizStatus in ('exptlistEnter','startAccept') AND m.SIGNUSERID IS null
|
||||
or (m.currentNodeOrBizStatus in ('exptlistEnter','startAccept','serIllegalEnter') AND m.SIGNUSERID IS null
|
||||
<choose>
|
||||
<when test="customParamMap.checkChildUnit eq '0'.toString()">
|
||||
AND m.area_code = #{customParamMap.areaCode}
|
||||
|
|
@ -502,7 +502,7 @@
|
|||
|
||||
</if>
|
||||
and ( m.SIGNUSERID = #{customParamMap.userId}
|
||||
or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus in ('exptlistEnter','startAccept') AND m.SIGNUSERID IS null)
|
||||
or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus in ('exptlistEnter','startAccept','serIllegalEnter') AND m.SIGNUSERID IS null)
|
||||
or exists (select 1 from tsrefgroupanduser tg where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId}))
|
||||
</where>
|
||||
</select>
|
||||
|
|
@ -1703,7 +1703,7 @@
|
|||
) m
|
||||
where m.BUSTYPE in ('33','7','12','14','27')
|
||||
and ( m.SIGNUSERID = #{customParamMap.userId}
|
||||
or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus in ('exptlistEnter','startAccept') AND m.SIGNUSERID IS null)
|
||||
or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus in ('exptlistEnter','startAccept','serIllegalEnter') AND m.SIGNUSERID IS null)
|
||||
or exists (select 1 from tsrefgroupanduser tg where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId}) )
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue