Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/exam

exam-06173-api/src/main/java/com/gyee/exam/modules/sys/user/service/impl/SysUserServiceImpl.java

@@ -148,13 +148,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
     }
 
+    /**
+     * mark字段不为空表示单点登录，不需要验证密码
+     * @param reqDTO
+     * @return
+     */
     @Override
     public SysUserLoginDTO login(SysUserLoginReqDTO reqDTO) {
-
-        LocalDate today = LocalDate.now();       // 获取当前日期
-        LocalDate expirationDate = LocalDate.parse(closingDate);      // 设定截止日期为2023年5月15号
-        if(today.isAfter(expirationDate)&&!validatePassword(reqDTO.getPassword())){
-            throw new ServiceException("密码强度不够，请联系管理员更新密码！");
+        if (null == reqDTO.getMark() || reqDTO.getMark().trim().length()<1){
+            LocalDate today = LocalDate.now();       // 获取当前日期
+            LocalDate expirationDate = LocalDate.parse(closingDate);      // 设定截止日期为2023年5月15号
+            if(today.isAfter(expirationDate)&&!validatePassword(reqDTO.getPassword())){
+                throw new ServiceException("密码强度不够，请联系管理员更新密码！");
+            }
         }
 
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();