组织结构

src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

@@ -75,7 +75,7 @@ public class DatePermissionInterceptor implements Interceptor {
 			if(threadLocalObj != null) {
 				orgId = ObjectUtils.toString(threadLocalObj);
 			}
-			if(orgId!=null && !"10".equals(orgId)) {
+			if(orgId!=null && !"9".equals(orgId)) {
 				//机构单独查询时使用递归查询，可以查询机构下级机构
 				if("com.chinaitop.depot.system.mapper.OrgInfoMapper.selectByExample".equals(mappedStatement.getId())) {
 					bouString = bouString.replaceAll("org_info", "(SELECT * from org_info"

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

@@ -90,15 +90,12 @@ 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,Integer orgId) {
+	public PageInfo<OrgInfo> getOrgInfo(Integer pageNum, Integer pageSize, Integer parentId, String orgName) {
 		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 + "%");
 		}