用户查询接口修改

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/repository/PartyEmployeeRepository.java

@@ -30,7 +30,7 @@ public interface PartyEmployeeRepository extends IRepository<String, PartyEmploy
 	 * @param position
 	 * @return
 	 */
-	public List<PartyEmployeePo> getEmployeeByPosition(QueryFilter queryFilter);
+	public List<PartyEmployeePo> getEmployeeByPosition(QueryFilter queryFilter,String position);
 	
 	/**
 	 * 获取员工信息附带组织名称

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/repository/impl/PartyEmployeeRepositoryImpl.java

@@ -213,8 +213,9 @@ public class PartyEmployeeRepositoryImpl extends AbstractRepository<String, Part
     }
 
 	@Override
-	public List<PartyEmployeePo> getEmployeeByPosition(QueryFilter queryFilter) {
+	public List<PartyEmployeePo> getEmployeeByPosition(QueryFilter queryFilter,String position) {
 		//return findByKey("findByPosition", "findIdsByPositionId", b().a("position", "%" + position + "%").p());
+		queryFilter.addParamsFilter("position", "%" + position + "%");
 		return queryByKey("findByPosition", "findIdsByPositionId", queryFilter);
 	}
 

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

@@ -379,32 +379,32 @@
     </select>
 
 	<select id="findByPosition"  parameterType="java.util.Map" resultMap="PartyEmployee">
-		select <include refid="columns"/> from IBPS_PARTY_EMPLOYEE b
-	    where b.POSITIONS_ in
-		(
-		select id_ from ibps_party_entity
-		<where>
-			<if test="@o.Ognl@isNotEmpty(whereSql)">
-				AND ${whereSql}
-			</if>
-		</where>
-		<!--where PATH_ like #{position}-->
-		)
+		select <include refid="columns"/> from IBPS_PARTY_EMPLOYEE
+		left join ( select ID_ USER_ID_,ACCOUNT_,IS_SUPER_ from IBPS_PARTY_USER ) A on USER_ID_ = ID_
+		left join ( select ID_ ORG_ID_,NAME_ ORG_NAME_ from IBPS_PARTY_ORG )B on ORG_ID_ = GROUP_ID_
+		where ID_ != '-1'
+		AND STATUS_ != 'deleted'
+		<if test="@o.Ognl@isNotEmpty(whereSql)">
+			AND ${whereSql}
+		</if>
+		<if test="@o.Ognl@isNotEmpty(position)">
+			AND POSITIONS_ in(select id_ from ibps_party_entity where PATH_ like #{position} )
+		</if>
 		ORDER BY CREATE_TIME_ DESC
 	</select>
 
 	<select id="findIdsByPositionId"  parameterType="java.util.Map" resultMap="PartyEmployee">
-		select ID_ from IBPS_PARTY_EMPLOYEE b
-		where b.POSITIONS_ in
-		(
-		select id_ from ibps_party_entity
-		<where>
-			<if test="@o.Ognl@isNotEmpty(whereSql)">
-				AND ${whereSql}
-			</if>
-		</where>
-		<!--where PATH_ like #{position}-->
-		)
+		select ID_ from IBPS_PARTY_EMPLOYEE
+		left join ( select ID_ USER_ID_,ACCOUNT_,IS_SUPER_ from IBPS_PARTY_USER ) A on USER_ID_ = ID_
+		left join ( select ID_ ORG_ID_,NAME_ ORG_NAME_ from IBPS_PARTY_ORG )B on ORG_ID_ = GROUP_ID_
+		where ID_ != '-1'
+		AND STATUS_ != 'deleted'
+		<if test="@o.Ognl@isNotEmpty(whereSql)">
+			AND ${whereSql}
+		</if>
+		<if test="@o.Ognl@isNotEmpty(position)">
+			AND POSITIONS_ in(select id_ from ibps_party_entity where PATH_ like #{position} )
+		</if>
 		ORDER BY CREATE_TIME_ DESC
 	</select>
 

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/org/provider/PartyEmployeeProvider.java

@@ -119,9 +119,8 @@ public class PartyEmployeeProvider extends GenericProvider implements IPartyEmpl
 			List<PartyEmployeePo> list;
 			QueryFilter queryFilter = getQueryFilter(request);
 			if (request.getCustoms()!=null){
-				queryFilter.addFilter("PATH_", "%" + request.getCustoms().get("position") + "%" , QueryOP.LIKE);
 				partyEmployeeRepository.setQueryOrgPath();
-				list = partyEmployeeRepository.getEmployeeByPosition(queryFilter);
+				list = partyEmployeeRepository.getEmployeeByPosition(queryFilter,  request.getCustoms().get("position").toString() );
 			}else {
 				handleParams("query", request, queryFilter);
 				partyEmployeeRepository.setQueryOrgPath();