update

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -227,7 +227,7 @@ public class UserController extends BaseExamController {
     public JSONObject reSetPassword(@RequestParam Integer[] ids, @RequestParam String password) {
         for (Integer id : ids) {
             User user = userService.findById(id);
-            if (user == null) {
+            if (user == null || UserSource.EXTERNAL.equals(user.getSource())) {
                 continue;
             }
             password = StringEscapeUtils.unescapeHtml(password);

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/LoginController.java

@@ -78,7 +78,7 @@ public class LoginController extends BaseApiController {
         if (!user.isEnable()) {
             throw ApiException.USER_DISABLED;
         }
-        if (!Role.SCHOOL_ADMIN.equals(user.getRole()) || !Role.SCAN_ADMIN.equals(user.getRole())) {
+        if (!Role.SCHOOL_ADMIN.equals(user.getRole()) && !Role.SCAN_ADMIN.equals(user.getRole())) {
             throw ApiException.USER_ROLE_INVALID;
         }
         user.setLastLoginTime(new Date());