|
@@ -88,9 +88,10 @@ public class OrgInfoController {
|
88
|
88
|
@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
|
89
|
89
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
|
90
|
90
|
@ApiImplicitParam(name = "orgName", value = "组织机构名", paramType = "query"),
|
91
|
|
- @ApiImplicitParam(name = "parentId", value = "上级组织机构编号", paramType = "query")
|
|
91
|
+ @ApiImplicitParam(name = "parentId", value = "上级组织机构编号", paramType = "query"),
|
|
92
|
+ @ApiImplicitParam(name = "orgClassId", value = "单位类型(5317:单位,5318:库区)", paramType = "query")
|
92
|
93
|
})
|
93
|
|
- public PageInfo<OrgInfo> getOrgInfo(Integer pageNum, Integer pageSize, Integer parentId, String orgName) {
|
|
94
|
+ public PageInfo<OrgInfo> getOrgInfo(Integer pageNum, Integer pageSize, Integer parentId, String orgName, Integer orgClassId) {
|
94
|
95
|
OrgInfoExample example = new OrgInfoExample();
|
95
|
96
|
Criteria criteria = example.createCriteria();
|
96
|
97
|
if (parentId != null) {
|
|
@@ -99,6 +100,9 @@ public class OrgInfoController {
|
99
|
100
|
if (StringUtils.isNotBlank(orgName)) {
|
100
|
101
|
criteria.andOrgNameLike("%" + orgName + "%");
|
101
|
102
|
}
|
|
103
|
+ if (orgClassId != null) {
|
|
104
|
+ criteria.andOrgClassIdEqualTo(orgClassId);
|
|
105
|
+ }
|
102
|
106
|
if (pageNum!=null && pageSize!=null) {
|
103
|
107
|
PageHelper.startPage(pageNum, pageSize);
|
104
|
108
|
}
|