Bladeren bron

Merge branch 'V2.0.1' into test

zhaoxian 3 jaren geleden
bovenliggende
commit
f8afdf62a0

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataAccountsController.java

@@ -140,8 +140,8 @@ public class LiveDataAccountsController {
             queryWrapper.eq("live_account_name", liveDataAccounts.getLiveAccountName());
             queryWrapper.eq("state", 1).last("limit 1");
             LiveDataAccounts one = liveDataAccountsService.getOne(queryWrapper);
-            if (!Check.isNull(one) && one.getLiveAccountId() != liveDataAccounts.getLiveAccountId()) {
-                return Result.ok("修改失败,该账户名称已存在,请重新命名");
+            if (!Check.isNull(one) && one.getLiveAccountId() - liveDataAccounts.getLiveAccountId() != 0) {
+                return Result.error("修改失败,该账户名称已存在,请重新命名");
             }
         }
         liveDataAccountsService.updateById(liveDataAccounts);