submit

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1270,9 +1270,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
+        SysTenant tenant = iSysTenantService.getById(user.getTenantId());
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
         map.put("user_account",user.getUserAccount());
+        if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+            //判斷用戶是否需要修改密碼
+            Long time = ObjectUtils.isNotNull(user.getPwdTime())?user.getPwdTime():user.getCreateTime();
+            Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+            if (dayAfter < DateUtils.getNowTime()){
+                map.put("pwd_sign",1);
+            }
+        }
         map.put("full_info",Validator.isEmpty(user.getIdCard())?false:true); //是否完善身份信息
         return map;
     }
@@ -1393,9 +1402,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
+        SysTenant tenant = iSysTenantService.getById(user.getTenantId());
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
         map.put("user_account",user.getUserAccount());
+        if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+            //判斷用戶是否需要修改密碼
+            Long time = ObjectUtils.isNotNull(user.getPwdTime())?user.getPwdTime():user.getCreateTime();
+            Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+            if (dayAfter < DateUtils.getNowTime()){
+                map.put("pwd_sign",1);
+            }
+        }
         map.put("full_info",Validator.isEmpty(user.getIdCard())?false:true); //是否完善身份信息
         return map;
     }
@@ -1567,9 +1585,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
+        SysTenant tenant = iSysTenantService.getById(user.getTenantId());
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
         map.put("user_account",user.getUserAccount());
+        if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+            //判斷用戶是否需要修改密碼
+            Long time = ObjectUtils.isNotNull(user.getPwdTime())?user.getPwdTime():user.getCreateTime();
+            Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+            if (dayAfter < DateUtils.getNowTime()){
+                map.put("pwd_sign",1);
+            }
+        }
         map.put("full_info",Validator.isEmpty(user.getIdCard())?false:true); //是否完善身份信息
         return map;
     }
@@ -2279,9 +2306,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
+        SysTenant tenant = iSysTenantService.getById(user.getTenantId());
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
         map.put("user_account",user.getUserAccount());
+        if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+            //判斷用戶是否需要修改密碼
+            Long time = ObjectUtils.isNotNull(user.getPwdTime())?user.getPwdTime():user.getCreateTime();
+            Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+            if (dayAfter < DateUtils.getNowTime()){
+                map.put("pwd_sign",1);
+            }
+        }
         map.put("full_info",Validator.isEmpty(user.getIdCard())?false:true); //是否完善身份信息
         return map;
     }