|
@@ -44,13 +44,16 @@
|
|
|
SELECT * FROM IBPS_PARTY_USER
|
|
SELECT * FROM IBPS_PARTY_USER
|
|
|
left join
|
|
left join
|
|
|
(
|
|
(
|
|
|
- select ID_ USER_ID_, NAME_, NAME_ FULL_NAME_,STATUS_,GENDER_,EMAIL_,WC_ACCOUNT_,ADDRESS_,MOBILE_,QQ_,PHOTO_ from IBPS_PARTY_EMPLOYEE
|
|
|
|
|
|
|
+ select ID_ USER_ID_, NAME_, NAME_ FULL_NAME_,STATUS_,GENDER_,EMAIL_,WC_ACCOUNT_,ADDRESS_,MOBILE_,QQ_,PHOTO_,JIAN_DING_ZI_GE_Z from IBPS_PARTY_EMPLOYEE
|
|
|
)A on USER_ID_ = ID_
|
|
)A on USER_ID_ = ID_
|
|
|
<where>
|
|
<where>
|
|
|
USER_ID_ != '-1' AND A.STATUS_ != 'deleted'
|
|
USER_ID_ != '-1' AND A.STATUS_ != 'deleted'
|
|
|
<if test="@o.Ognl@isNotEmpty(whereSql)">
|
|
<if test="@o.Ognl@isNotEmpty(whereSql)">
|
|
|
and ${whereSql}
|
|
and ${whereSql}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="@o.Ognl@isNotEmpty(JIAN_DING_ZI_GE_Z)">
|
|
|
|
|
+ AND A.JIAN_DING_ZI_GE_Z like CONCAT('%', #{JIAN_DING_ZI_GE_Z}, '%')
|
|
|
|
|
+ </if>
|
|
|
</where>
|
|
</where>
|
|
|
<if test="@o.Ognl@isNotEmpty(orderBySql)">
|
|
<if test="@o.Ognl@isNotEmpty(orderBySql)">
|
|
|
ORDER BY ${orderBySql}
|
|
ORDER BY ${orderBySql}
|
|
@@ -418,7 +421,7 @@
|
|
|
LEFT JOIN (
|
|
LEFT JOIN (
|
|
|
SELECT
|
|
SELECT
|
|
|
ID_ USER_ID_, NAME_, NAME_ FULL_NAME_,GROUP_ID_,POSITIONS_,STATUS_,
|
|
ID_ USER_ID_, NAME_, NAME_ FULL_NAME_,GROUP_ID_,POSITIONS_,STATUS_,
|
|
|
- GENDER_,EMAIL_,WC_ACCOUNT_,ADDRESS_,MOBILE_,QQ_,PHOTO_
|
|
|
|
|
|
|
+ GENDER_,EMAIL_,WC_ACCOUNT_,ADDRESS_,MOBILE_,QQ_,PHOTO_,JIAN_DING_ZI_GE_Z
|
|
|
FROM IBPS_PARTY_EMPLOYEE
|
|
FROM IBPS_PARTY_EMPLOYEE
|
|
|
) A ON USER_ID_ = ID_
|
|
) A ON USER_ID_ = ID_
|
|
|
LEFT JOIN (
|
|
LEFT JOIN (
|
|
@@ -437,6 +440,9 @@
|
|
|
)
|
|
)
|
|
|
)
|
|
)
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="@o.Ognl@isNotEmpty(JIAN_DING_ZI_GE_Z)">
|
|
|
|
|
+ AND A.JIAN_DING_ZI_GE_Z like CONCAT('%', #{JIAN_DING_ZI_GE_Z}, '%')
|
|
|
|
|
+ </if>
|
|
|
<if test="@o.Ognl@isNotEmpty(position)">
|
|
<if test="@o.Ognl@isNotEmpty(position)">
|
|
|
AND EXISTS (SELECT 1 FROM ibps_party_entity d WHERE FIND_IN_SET( d.id_, a.positions_ ) AND ( d.path_ LIKE #{position} ) )
|
|
AND EXISTS (SELECT 1 FROM ibps_party_entity d WHERE FIND_IN_SET( d.id_, a.positions_ ) AND ( d.path_ LIKE #{position} ) )
|
|
|
</if>
|
|
</if>
|
|
@@ -470,6 +476,9 @@
|
|
|
)
|
|
)
|
|
|
)
|
|
)
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="@o.Ognl@isNotEmpty(JIAN_DING_ZI_GE_Z)">
|
|
|
|
|
+ AND A.JIAN_DING_ZI_GE_Z like CONCAT('%', #{JIAN_DING_ZI_GE_Z}, '%')
|
|
|
|
|
+ </if>
|
|
|
<if test="@o.Ognl@isNotEmpty(position)">
|
|
<if test="@o.Ognl@isNotEmpty(position)">
|
|
|
AND EXISTS (SELECT 1 FROM ibps_party_entity d WHERE FIND_IN_SET( d.id_, a.positions_ ) AND ( d.path_ LIKE #{position} ) )
|
|
AND EXISTS (SELECT 1 FROM ibps_party_entity d WHERE FIND_IN_SET( d.id_, a.positions_ ) AND ( d.path_ LIKE #{position} ) )
|
|
|
</if>
|
|
</if>
|