diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java index 9416eb7..829d3cf 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java @@ -122,14 +122,13 @@ public class ScoreUtil { * @param majorBatch 专业批次 */ public static boolean hasComputeEnrollProbabilityPermissions(String nowBatch,String majorBatch){ - return true; - /*if (StringUtils.isBlank(nowBatch) || StringUtils.isBlank(majorBatch)) { + if (StringUtils.isBlank(nowBatch) || StringUtils.isBlank(majorBatch)) { return false; } //将两个批次设置为数字等级,数字越小 权限越多 1st. - int nowLevel = "本科A段".equals(nowBatch) ? 1 : "本科B段".equals(nowBatch) ? 2 : "本科".equals(nowBatch) ? 3 : 4; + int nowLevel = "本科A段".equals(nowBatch) ? 1 : "本科B段".equals(nowBatch) ? 1 : "本科".equals(nowBatch) ? 3 : 4; int majorLevel = "提前批".equals(majorBatch)?1: "本科A段".equals(majorBatch) ? 1 : "本科B段".equals(majorBatch) ? 2 : "本科".equals(majorBatch) ? 3 : 4; - return nowLevel<=majorLevel;*/ + return nowLevel<=majorLevel; } /**