登录密码校验修改

src/main/java/com/glxp/api/controller/auth/AuthUserController.java

@@ -176,7 +176,7 @@ public class AuthUserController extends BaseController {
     }
 
 
-    @AuthRuleAnnotation("")
+//    @AuthRuleAnnotation("")
     @PostMapping("/admin/auth/admin/force/updateUser")
     public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {

src/main/java/com/glxp/api/controller/auth/LoginController.java

@@ -118,6 +118,12 @@ public class LoginController extends BaseController {
         // 登录成功后获取权限，这里面会设置到缓存
 //        authLoginService.listRuleByAdminId(authAdmin.getId());
 
+//        cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ?
+        if (cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? cn.hutool.core.date.DateUtil.date() : authAdmin.getLastUpdatePwdTime()
+                , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 90) {
+            return ResultVOUtils.error(509, "密码已过期，请修改密码");
+        }
+
         Map<String, Object> claims = new HashMap<>();
         claims.put("admin_id", authAdmin.getId());
         String token = JwtUtils.createToken(claims, 86400L); // 一天后过期
@@ -132,7 +138,7 @@ public class LoginController extends BaseController {
         loginResponse.setDept(authAdmin.getLocDeptCode());
         loginResponse.setDeptName(authAdmin.getDeptName());
         loginResponse.setNeedChangePwd(cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? cn.hutool.core.date.DateUtil.date() : authAdmin.getLastUpdatePwdTime()
-                , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 90);
+                , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 60);
         logininforService.recordLogininfor(authAdmin.getEmployeeName(), Constant.LOGIN_SUCCESS, "登录成功！", request);
 
         return ResultVOUtils.success(loginResponse);

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -396,11 +396,11 @@ public class IoCodeTempController extends BaseController {
                 }
                 return ResultVOUtils.error(500, "单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试！");
             }
-        }
 
         if (udiInfoEntity.getRequireScanCode() == 1){
             //是否校验耗材材质  1：高值耗材；2.普通耗材
             if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+            }
                 if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
                     return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
                 }