|
|
@@ -2,6 +2,7 @@ package com.cyksj.web.controller.manage.account;
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
@@ -364,18 +365,20 @@ public class CmsAccountController {
|
|
|
account.setPassword(account.getPassword().trim());
|
|
|
}
|
|
|
String verifyCodes = account.getVerifyCodes();
|
|
|
- if (StrUtil.isNotBlank(verifyCodes) && !StrUtil.equals(verifyCodes, account.getVerifyCodes())) {
|
|
|
+ if (StrUtil.isNotBlank(verifyCodes) && !StrUtil.equals(verifyCodes, db.getVerifyCodes())) {
|
|
|
String[] verifyCodesArray = verifyCodes.split(",");
|
|
|
List<GroupsRelationView> relationViews = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.builder()
|
|
|
.field(GroupsRelationView::getAccountId, account.getId())
|
|
|
.onlySelect(GroupsRelationView::getId)
|
|
|
.build());
|
|
|
- for (int i = 0; i < verifyCodesArray.length; i++) {
|
|
|
- if (i < relationViews.size()) {
|
|
|
- GroupsRelationView groupsRelationView = relationViews.get(i);
|
|
|
- groupsRelationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
|
|
|
- .set(GroupsRelation::getVerifyCode, verifyCodesArray[i])
|
|
|
- .eq(GroupsRelation::getId, groupsRelationView.getId()));
|
|
|
+ if (CollUtil.isNotEmpty(relationViews)) {
|
|
|
+ for (int i = 0; i < verifyCodesArray.length; i++) {
|
|
|
+ if (i < relationViews.size()) {
|
|
|
+ GroupsRelationView groupsRelationView = relationViews.get(i);
|
|
|
+ groupsRelationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
|
|
|
+ .set(GroupsRelation::getVerifyCode, verifyCodesArray[i])
|
|
|
+ .eq(GroupsRelation::getId, groupsRelationView.getId()));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|