zoujiajian 3 éve
szülő
commit
82590f0a03

+ 5 - 1
netflix-dao/src/main/java/com/cyksj/model/excel/ExcelManageAccountData.java

@@ -22,7 +22,7 @@ import java.util.Date;
 		"left join groups_trips gt on gt.account_id = a.id " +
 		"left join groups_relation gr on gr.groups_id = gt.id " +
 		"left join goods_don_sku gdk on gdk.id = gt.sku_id",
-		groupBy = "a.id,g.id,a.bank_card,g.title,a.account,a.password,a.api_key,a.start_time,a.expiry_time,a.amount,a.cn_account,a.us_account,gt.id,a.remark,gdk.id,gdk.spec_val")
+		groupBy = "a.id,g.id,a.bank_card,g.title,a.account,a.password,a.api_key,a.verify_codes,a.start_time,a.expiry_time,a.amount,a.cn_account,a.us_account,gt.id,a.remark,gdk.id,gdk.spec_val")
 public class ExcelManageAccountData {
 
 	@ExcelIgnore
@@ -49,6 +49,10 @@ public class ExcelManageAccountData {
 	@DbField("a.api_key")
 	private String apiKey;
 
+	@ExcelProperty("校验码")
+	@DbField("a.verify_codes")
+	private String verifyCodes;
+
 	@ExcelProperty("银行卡号")
 	@DbField("a.bank_card")
 	private String bankCard;

+ 10 - 7
netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -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()));
+				    }
 			    }
 		    }
 	    }