From 39f2709f542cbb5696b87192c04b9449cf58517d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 15 Mar 2024 09:40:01 +0800
Subject: [PATCH] bug

---
 .../src/views/EventMarketing/SaveBlock/index.vue     | 12 ++++++------
 .../userManager/service/impl/LJUserServiceImpl.java  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index 4e356b6c3..5d046cbeb 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -42,11 +42,11 @@
                   <span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="activityProgress" label="活动进度" align="center" >
+              <el-table-column prop="activeStatus" label="活动状态" align="center" >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.activityProgress == 0"> <el-tag>未开始</el-tag></span>
-                  <span v-if="scope.row.activityProgress == 1"> <el-tag>进行中</el-tag></span>
-                  <span v-if="scope.row.activityProgress == 2"> <el-tag type="danger">已结束</el-tag></span>
+<!--                  <span v-if="scope.row.activeStatus == 0"> <el-tag>未开始</el-tag></span>-->
+                  <span v-if="scope.row.activeStatus == 1"> <el-tag>进行中</el-tag></span>
+                  <span v-if="scope.row.activeStatus == 2"> <el-tag type="danger">已结束</el-tag></span>
                 </template>
               </el-table-column>
               <el-table-column prop="activityProgress" label="上线/下线" align="center" >
@@ -243,8 +243,8 @@
             <div>
             <el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
               <el-radio-group v-model="form.activeStatus" :disabled="isOnLine">
-                <el-radio label="1">启用</el-radio>
-                <el-radio label="2">禁用</el-radio>
+                <el-radio label="1">进行中</el-radio>
+                <el-radio label="2">已结束</el-radio>
               </el-radio-group>
             </el-form-item>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
index f9a74a4b2..82ceb1c48 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
@@ -495,7 +495,7 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
     public int updateUser(LJUserVo userVo) {
         int row = 0;
         LJUser user1 = this.selectUserByMobile(userVo.getMobile());
-        if (ObjectUtil.isNotEmpty(user1) && user1.getId()!=userVo.getId()){
+        if (ObjectUtil.isNotEmpty(user1) && !user1.getId().equals(userVo.getId())){
             row = 0;
             return row;
         }