添加员工账号（禁用后不能再注册）

wisenergy-mapper/src/main/resources/mapper/StaffMapper.xml

@@ -145,8 +145,6 @@
         <include refid="table"/>
         <where>
             login_name=#{loginName}
-            and
-            is_delete=0
         </where>
     </select>
 </mapper>
\ No newline at end of file

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -410,7 +410,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             return R.error("考生无副科成绩!");
         }
         //本科or专科
-        String gradeType = schemeVo.getGradeType() == null ? null : schemeVo.getGradeType();
+        String gradeType=StringUtils.isBlank(schemeVo.getGradeType()) ? null : schemeVo.getGradeType();
         //文化分
         Double majorGrade = scoreInfo.getMajorGrade();
         //专业分
@@ -996,7 +996,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
     private List<Volunteer> fillUpVolunteer(List<Volunteer> list, Integer number, double max, double min, Integer type, List<String> classNames) {
 
         String classStr = classNames.stream().map(String::valueOf).collect(Collectors.joining(","));
-        //筛选出带和的字符串的限专业学校进行判断
+        //筛选出带和的字符串的限专业学校并进行判断
         Iterator<Volunteer> iterator = list.iterator();
         while(iterator.hasNext()){
             Volunteer info = iterator.next();

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/StaffServiceImpl.java

@@ -151,7 +151,7 @@ public class StaffServiceImpl implements StaffService {
 
         //查询管理者信息
         Staff staff3 = staffMapper.getStaff(map);
-        if (null!=staff3) {
+        if (null != staff3) {
             return R.error("用户已存在");
         }
 

wisenergy-service/src/main/java/cn/wisenergy/service/shir/filter/KickoutSessionControlFilter.java

@@ -169,13 +169,14 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
         return result || isFilter;
     }
 
+    //存入session,判断并踢出之前登录的用户
     public void changeSession(int type){
         log.info("KickoutSessionControlFilter changeSession begin.......type : "+type);
         Subject subject = SecurityUtils.getSubject();
         Session session = subject.getSession();
         Serializable sessionId = session.getId();
-        Integer userId = null;
-        String tableName = "";
+        Integer userId;
+        String tableName;
         if(type == 1){
             User user=(User)subject.getPrincipal();
             userId=user.getId();