增加条件

src/main/java/com/chinaitop/depot/system/controller/OrgInfoController.java

@@ -90,12 +90,15 @@ public class OrgInfoController {
 			@ApiImplicitParam(name = "orgName", value = "组织机构名", paramType = "query"),
 			@ApiImplicitParam(name = "parentId", value = "上级组织机构编号", paramType = "query")
 	})
-	public PageInfo<OrgInfo> getOrgInfo(Integer pageNum, Integer pageSize, Integer parentId, String orgName) {
+	public PageInfo<OrgInfo> getOrgInfo(Integer pageNum, Integer pageSize, Integer parentId, String orgName,Integer orgId) {
 		OrgInfoExample example = new OrgInfoExample();
 		Criteria criteria = example.createCriteria();
 		if (parentId != null) {
 			criteria.andParentIdEqualTo(parentId);
 		}
+		if( "" != orgId+"" && orgId != null){
+			criteria.andOrgIdEqualTo(orgId);
+		}
 		if (StringUtils.isNotBlank(orgName)) {
 			criteria.andOrgNameLike("%" + orgName + "%");
 		}