Merge branch 'matser' of http://119.23.210.103:3000/wy/zdqy_ibps into matser

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

@@ -426,7 +426,7 @@
 		) B ON ORG_ID_ = GROUP_ID_
 		WHERE
 			USER_ID_ != '-1'
-		AND A.STATUS_ != 'deleted'
+		AND A.STATUS_ ='actived'
 		<if test="@o.Ognl@isNotEmpty(roleIds)">
 		AND (
 			USER_ID_ IN (

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

@@ -164,7 +164,7 @@
             )C on ENTITY_ID_ = GROUP_ID_
         </if>
         <where>
-            USER_ID_ != '-1' AND A.STATUS_ != 'deleted'
+            USER_ID_ != '-1' AND A.STATUS_ = 'actived'
             <if test="@o.Ognl@isNotEmpty(whereSql)">
                 and ${whereSql}
             </if>
@@ -195,7 +195,7 @@
         select ID_ ORG_ID_ from IBPS_PARTY_ORG
         )B on ORG_ID_ = GROUP_ID_
         <where>
-            USER_ID_ != '-1' AND A.STATUS_ != 'deleted'
+            USER_ID_ != '-1' AND A.STATUS_ = 'actived'
             <if test="@o.Ognl@isNotEmpty(whereSql)">
                 and ${whereSql}
             </if>
@@ -234,7 +234,7 @@
         ) UG
         ON GROUP_USER_ID_ = ID_
         <where>
-            USER_ID_ != '-1' AND A.STATUS_ != 'deleted'
+            USER_ID_ != '-1' AND A.STATUS_ ='actived'
             <if test="@o.Ognl@isNotEmpty(groupId)">
 	            AND UG.GROUP_ID_ = #{groupId}
 	        </if>