Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java

@@ -44,17 +44,17 @@ public class ClassifyApi {
 			return null;
 		}
 		String dept = AuthUtil.getUser().getDeptId();
-		if (!("0").equals(dept)){
-			if (!deptId.contains(dept)){
-				log.error(method+"当前登录人无法对选择部门进行考核");
-				return R.fail("此账号无法对该部门进行考核");
-			}
-		}
+//		if (!("0").equals(dept)){
+//			if (!deptId.contains(dept)){
+//				log.error(method+"当前登录人无法对选择部门进行考核");
+//				return R.fail("此账号无法对该部门进行考核");
+//			}
+//		}
 		List<Long> list = Func.toLongList(deptId);
 		int indexOf = list.indexOf(Long.parseLong(dept));
 		if (list.size() - 1 == indexOf){
 			//当前登录账号处于组织结构树最后一级就只能进行最后一级的指标项搜索
-			deptId = dept;
+			list.remove(indexOf);
 		}
 		List<ClassifyApiVO> detail = classifyService.selectClassifyList(deptId);
 		return R.data(detail);