|
|
@@ -102,7 +102,7 @@ public class CmsAccountController {
|
|
|
|
|
|
@GetMapping("/get")
|
|
|
@SaCheckPermission("account:view")
|
|
|
- public Result<SearchResult<AccountView>> get(Long userId, String showId, String nickName, String submitAccount, String expiryStartTime, String expiryEndTime, Boolean expiredAll, Boolean existsExpired, Boolean existsExpiredToday, Boolean pwdNotChangedThePastPwd) {
|
|
|
+ public Result<SearchResult<AccountView>> get(Long userId, String showId, String nickName, String submitAccount, String expiryStartTime, String expiryEndTime, Boolean expiredAll, Boolean existsExpired, Boolean existsExpiredToday, Integer noChangeMonths) {
|
|
|
MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
if (StrUtil.isNotEmpty(expiryStartTime) || StrUtil.isNotEmpty(expiryEndTime)) {
|
|
|
mapBuilder.field(AccountView::getExpiryTime, expiryStartTime, expiryEndTime)
|
|
|
@@ -125,8 +125,8 @@ public class CmsAccountController {
|
|
|
extra_sql += "(if((select count(ur.id) from user_ticket_cleared_record ur where ur.account_id = a.id and deleted is true and source = 'self')>=4,true,false)) = 1";
|
|
|
}
|
|
|
|
|
|
- if (pwdNotChangedThePastPwd != null && pwdNotChangedThePastPwd) {
|
|
|
- DateTime pastMonth = DateUtil.offsetMonth(DateTime.now(), -1);
|
|
|
+ if (noChangeMonths != null) {
|
|
|
+ DateTime pastMonth = DateUtil.offsetMonth(DateTime.now(), -noChangeMonths);
|
|
|
List<Long> accountIds = accountUpdatePasswordRecordMapper.selectPasswordNotChangedThePastMonthAccountId(pastMonth);
|
|
|
mapBuilder.field(AccountView::getId, accountIds).op(Operator.InList);
|
|
|
}
|