|
|
@@ -193,10 +193,6 @@ public class CmsAccountController {
|
|
|
flag = true;
|
|
|
}
|
|
|
String oldPwd = account.getPassword();
|
|
|
- if (StrUtil.isNotBlank(data.getStartTime())) {
|
|
|
- account.setStartTime(DateUtil.parse(data.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
- flag = true;
|
|
|
- }
|
|
|
if (StrUtil.isNotBlank(data.getExpiryTime())) {
|
|
|
account.setExpiryTime(DateUtil.parse(data.getExpiryTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
flag = true;
|
|
|
@@ -211,6 +207,7 @@ public class CmsAccountController {
|
|
|
templateCommonService.sendAccountTemplateMsg(account);
|
|
|
}
|
|
|
if (flag) {
|
|
|
+ account.setStartTime(null);
|
|
|
accountService.updateById(account);
|
|
|
if (isUpdatePwd) {
|
|
|
//清空过期账号 逻辑删除
|
|
|
@@ -382,6 +379,7 @@ public class CmsAccountController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ account.setStartTime(null);
|
|
|
accountService.updateById(account);
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult();
|
|
|
}
|