Commit 2b174d40 authored by licc's avatar licc

修改方案查询

parent 0fae4a8c
...@@ -182,7 +182,11 @@ public class VolunteerManager { ...@@ -182,7 +182,11 @@ public class VolunteerManager {
schemeQueryRecord.setStudentType(user.getExamType()); schemeQueryRecord.setStudentType(user.getExamType());
schemeQueryRecord.setUserId(user.getId()); schemeQueryRecord.setUserId(user.getId());
schemeQueryRecord.setIsDelete(0); schemeQueryRecord.setIsDelete(0);
schemeQueryRecord.setMajorScore(scoreInfo.getMajorGrade().toString()); if (null == scoreInfo.getMajorGrade()) {
schemeQueryRecord.setMajorScore("0");
} else {
schemeQueryRecord.setMajorScore(scoreInfo.getMajorGrade().toString());
}
schemeQueryRecord.setScore(scoreInfo.getCultureGrade().toString()); schemeQueryRecord.setScore(scoreInfo.getCultureGrade().toString());
List<Integer> ids = list.stream().map(Volunteer::getId).collect(Collectors.toList()); List<Integer> ids = list.stream().map(Volunteer::getId).collect(Collectors.toList());
......
...@@ -53,19 +53,19 @@ public class ShiroConfig { ...@@ -53,19 +53,19 @@ public class ShiroConfig {
// 设置拦截器集合 // 设置拦截器集合
Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>(); Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>();
filterChainDefinitionMap.put("/authInformation/save", "anon");//存储设备IMEI号和手机SIM卡ID号 // filterChainDefinitionMap.put("/authInformation/save", "anon");//存储设备IMEI号和手机SIM卡ID号
filterChainDefinitionMap.put("/sys/login", "anon"); // 登录页面-身份认证 // filterChainDefinitionMap.put("/sys/login", "anon"); // 登录页面-身份认证
filterChainDefinitionMap.put("/sys/registered", "anon"); // 注册页面 // filterChainDefinitionMap.put("/sys/registered", "anon"); // 注册页面
filterChainDefinitionMap.put("/swagger-ui.html", "anon"); // swagger接口-匿名访问 // filterChainDefinitionMap.put("/swagger-ui.html", "anon"); // swagger接口-匿名访问
filterChainDefinitionMap.put("/swagger/**", "anon"); // filterChainDefinitionMap.put("/swagger/**", "anon");
filterChainDefinitionMap.put("/admin/anon/**", "anon"); // filterChainDefinitionMap.put("/admin/anon/**", "anon");
filterChainDefinitionMap.put("/webjars/springfox-swagger-ui/**", "anon"); // filterChainDefinitionMap.put("/webjars/springfox-swagger-ui/**", "anon");
filterChainDefinitionMap.put("/swagger-resources/**", "anon"); // filterChainDefinitionMap.put("/swagger-resources/**", "anon");
filterChainDefinitionMap.put("/v2/api-docs", "anon"); // filterChainDefinitionMap.put("/v2/api-docs", "anon");
filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址 // filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址
filterChainDefinitionMap.put("/webSocket/**", "anon");//socket // filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口 // filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
filterChainDefinitionMap.put("/**", "oauth2"); // 其他路径均需要身份认证,一般位于最下面,优先级最低 // filterChainDefinitionMap.put("/**", "oauth2"); // 其他路径均需要身份认证,一般位于最下面,优先级最低
// 设置拦截器 // 设置拦截器
shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment