dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-03-15 09:40:01 +08:00
parent d85a897b5c
commit 39f2709f54
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -42,11 +42,11 @@
<span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span> <span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="activityProgress" label="活动进度" align="center" > <el-table-column prop="activeStatus" label="活动状态" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.activityProgress == 0"> <el-tag>未开始</el-tag></span> <!-- <span v-if="scope.row.activeStatus == 0"> <el-tag>未开始</el-tag></span>-->
<span v-if="scope.row.activityProgress == 1"> <el-tag>进行中</el-tag></span> <span v-if="scope.row.activeStatus == 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 == 2"> <el-tag type="danger">已结束</el-tag></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="activityProgress" label="上线/下线" align="center" > <el-table-column prop="activityProgress" label="上线/下线" align="center" >
@ -243,8 +243,8 @@
<div> <div>
<el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus"> <el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
<el-radio-group v-model="form.activeStatus" :disabled="isOnLine"> <el-radio-group v-model="form.activeStatus" :disabled="isOnLine">
<el-radio label="1">启用</el-radio> <el-radio label="1">进行中</el-radio>
<el-radio label="2">禁用</el-radio> <el-radio label="2">已结束</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -495,7 +495,7 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
public int updateUser(LJUserVo userVo) { public int updateUser(LJUserVo userVo) {
int row = 0; int row = 0;
LJUser user1 = this.selectUserByMobile(userVo.getMobile()); 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; row = 0;
return row; return row;
} }