submit

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -2,6 +2,7 @@ package com.zhongzheng.controller.user;
 
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
@@ -134,8 +135,15 @@ public class UserController extends BaseController {
             vo.setEduPhone(tenant.getEduPhone());
             vo.setSlabSign(tenant.getSlabSign());
             vo.setStudentRestudy(tenant.getStudentRestudy());
+            if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+                //判斷用戶是否需要修改密碼
+                Long time = ObjectUtils.isNotNull(vo.getPwdTime())?vo.getPwdTime():vo.getCreateTime();
+                Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+                if (dayAfter < DateUtils.getNowTime()){
+                    vo.setPwdSign(1);
+                }
+            }
         }
-
         bo.setUserId(loginUser.getUser().getUserId());
         iUserVisitLogService.insertByAddBo(bo);
         return AjaxResult.success(vo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -123,4 +123,6 @@ private static final long serialVersionUID=1L;
     private Integer slabSign;
     /** 学员重学按钮: 1不显示 0显示*/
     private Integer studentRestudy;
+    /** 学员密码默认更改天数*/
+    private Integer pwdCheckTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -321,6 +321,8 @@ public class UserVo {
 	private Integer slabSign;
 	@ApiModelProperty("学员重学按钮: 1不显示 0显示")
 	private Integer studentRestudy;
+	@ApiModelProperty("是否需要修改密碼: 1是 0否")
+	private Integer pwdSign;
 	public void setNull(){
 		this.setOpenId(null);
 /*		this.setIdCardImg1(null);