Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

ie-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java

@@ -106,14 +106,23 @@ public class SysLoginService
                 //卡密登录时，要将卡的密码转换为用户的密码。手机号的密码与卡的密码分开
                 DzCards card = cardsService.selectDzCardsByCardNo(username);
                 if (null==card){
-                    return AjaxResult.error("卡不存在");
-                }
-                if (!password.trim().equalsIgnoreCase(card.getPassword())){
-                    return AjaxResult.error("密码错误");
+                    if(username.length()>6&&username.length()<8){
+                        //老师账号，直接跳过
+
+                    }else if(username.length()>=8){
+                        //卡用户
+                        return AjaxResult.error("卡不存在");
+                    }
                 }
-                String dbPwd = userService.selectPasswordByCardId(card.getCardId());
-                if (StringUtils.isNotEmpty(dbPwd)){
-                    password = dbPwd;
+                if(null!=card&&username.length()>=8){
+                    //卡用户
+                    if (!password.trim().equalsIgnoreCase(card.getPassword())){
+                        return AjaxResult.error("密码错误");
+                    }
+                    String dbPwd = userService.selectPasswordByCardId(card.getCardId());
+                    if (StringUtils.isNotEmpty(dbPwd)){
+                        password = dbPwd;
+                    }
                 }
             }
         }

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzTeacherServiceImpl.java

@@ -78,7 +78,9 @@ public class DzTeacherServiceImpl implements IDzTeacherService
     {
         if (null == dzTeacher.getDeptId()){
             DzSchool school = schoolMapper.selectDzSchoolById(dzTeacher.getCampusId());
-            dzTeacher.setDeptId(school.getDeptId());
+            if (null!=school){
+                dzTeacher.setDeptId(school.getDeptId());
+            }
         }
         dzTeacherMapper.insertDzTeacher(dzTeacher);//将老师的userId填充到user的userName中
         Long teacherId = dzTeacher.getTeacherId();