Merge branch 'master' of http://101.36.160.140:21044/depot-qinghai/depot-system-qinghai

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

@@ -77,13 +77,13 @@ public class DatePermissionInterceptor implements Interceptor {
 			}
 			if(orgId!=null && !"10".equals(orgId)) {
 				//机构单独查询时使用递归查询，可以查询机构下级机构
-				if("com.chinaitop.depot.system.mapper.OrgInfoMapper.selectByExample".equals(mappedStatement.getId())) {
+				/*if("com.chinaitop.depot.system.mapper.OrgInfoMapper.selectByExample".equals(mappedStatement.getId())) {
 					bouString = bouString.replaceAll("org_info", "(SELECT * from org_info"
 							+ " WHERE FIND_IN_SET(org_id,getChildrenOrg("+orgId+"))) org_info ");
 					//gbase8s使用
-					/*bouString = bouString.replaceAll("org_info", "(SELECT * from org_info"
-							+ " start with org_id="+orgId+" connect by prior org_id = parent_id) org_info ");*/
-				}else {
+					bouString = bouString.replaceAll("org_info", "(SELECT * from org_info"
+							+ " start with org_id="+orgId+" connect by prior org_id = parent_id) org_info ");
+				}else {*/
 					//解析sql中的表名
 					Statement statement = CCJSqlParserUtil.parse(bouString);
 					Select selectStatement = (Select)statement;
@@ -122,7 +122,7 @@ public class DatePermissionInterceptor implements Interceptor {
 						+ " b,user_business u WHERE b.org_id = u.org_id AND u .user_id ='"+userId+"' AND u.business_type = '"+table+"') ");*/
 						
 					}
-				}
+				//}
 				
 				
 				//metaStatementHandler.setValue("delegate.boundSql.sql", bouString);