Explorar el Código

task6772港大人员选择器增加工号查询

WuYi hace 10 horas
padre
commit
aca23c0569

+ 11 - 2
ibps-model-root/modules/org-model/src/main/resources/com/lc/ibps/org/party/persistence/mapping/DefaultPartyUser.map.xml

@@ -44,13 +44,16 @@
 		SELECT * FROM IBPS_PARTY_USER
 		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_
 		<where>
 			USER_ID_ != '-1' AND A.STATUS_ != 'deleted'
 			<if test="@o.Ognl@isNotEmpty(whereSql)">
 				and ${whereSql}
 			</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>
 		<if test="@o.Ognl@isNotEmpty(orderBySql)">
 			ORDER BY ${orderBySql}
@@ -418,7 +421,7 @@
 		LEFT JOIN (
 			SELECT
 				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
 		) A ON USER_ID_ = ID_
 		LEFT JOIN (
@@ -437,6 +440,9 @@
 			)
 		)
 		</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)">
 			AND EXISTS (SELECT	1 FROM ibps_party_entity d	WHERE FIND_IN_SET( d.id_, a.positions_ ) AND ( d.path_ LIKE #{position} ) )
 		</if>
@@ -470,6 +476,9 @@
 			)
 		)
 		</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)">
 			AND EXISTS (SELECT	1 FROM ibps_party_entity d	WHERE FIND_IN_SET( d.id_, a.positions_ ) AND ( d.path_ LIKE #{position} ) )
 		</if>

+ 4 - 1
ibps-model-root/modules/org-model/src/main/resources/com/lc/ibps/org/party/persistence/mapping/PartyUser.map.xml

@@ -189,7 +189,7 @@
     <sql id="queryDialogUserByParamSql">
         SELECT <include refid="columns"/> FROM IBPS_PARTY_USER
         left join (
-        select ID_ USER_ID_, NAME_, NAME_ FULL_NAME_,GROUP_ID_,POSITIONS_,STATUS_,GENDER_,EMAIL_,WC_ACCOUNT_,ADDRESS_,MOBILE_,QQ_,PHOTO_ from IBPS_PARTY_EMPLOYEE
+        select ID_ USER_ID_, NAME_, NAME_ FULL_NAME_,GROUP_ID_,POSITIONS_,STATUS_,GENDER_,EMAIL_,WC_ACCOUNT_,ADDRESS_,MOBILE_,QQ_,PHOTO_,JIAN_DING_ZI_GE_Z from IBPS_PARTY_EMPLOYEE
         )A on USER_ID_ = ID_
         left join (
         select ID_ ORG_ID_ from IBPS_PARTY_ORG
@@ -205,6 +205,9 @@
                     POSITIONS_ like #{id}
                 </foreach>
             </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>
         <if test="@o.Ognl@isNotEmpty(orderBySql)">
             ORDER BY ${orderBySql}