1

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

@@ -88,9 +88,10 @@ public class OrgInfoController {
 			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
 			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
 			@ApiImplicitParam(name = "orgName", value = "组织机构名", paramType = "query"),
-			@ApiImplicitParam(name = "parentId", value = "上级组织机构编号", paramType = "query")
+			@ApiImplicitParam(name = "parentId", value = "上级组织机构编号", paramType = "query"),
+			@ApiImplicitParam(name = "orgClassId", value = "单位类型(5317:单位,5318:库区)", 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 orgClassId) {
 		OrgInfoExample example = new OrgInfoExample();
 		Criteria criteria = example.createCriteria();
 		if (parentId != null) {
@@ -99,6 +100,9 @@ public class OrgInfoController {
 		if (StringUtils.isNotBlank(orgName)) {
 			criteria.andOrgNameLike("%" + orgName + "%");
 		}
+		if (orgClassId != null) {
+			criteria.andOrgClassIdEqualTo(orgClassId);
+		}
 		if (pageNum!=null && pageSize!=null) {
 			PageHelper.startPage(pageNum, pageSize);
 		}