Browse Source

白名单bug修复

dzx 6 months ago
parent
commit
630de2c50c

+ 9 - 4
src/main/java/com/xjrsoft/module/base/controller/WhitelistManagementController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
@@ -17,6 +18,7 @@ import com.xjrsoft.module.base.entity.WhitelistManagement;
 import com.xjrsoft.module.base.service.IWhitelistManagementService;
 import com.xjrsoft.module.base.vo.WhitelistManagementPageVo;
 import com.xjrsoft.module.base.vo.WhitelistManagementVo;
+import com.xjrsoft.module.room.entity.RoomBed;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -107,11 +109,14 @@ public class WhitelistManagementController {
     @SaCheckPermission("whitelistmanagement:add")
     public RT<Boolean> setTemporary(@Valid @RequestBody List<Long> ids){
         List<WhitelistManagement> list = whitelistManagementService.listByIds(ids);
-        for (WhitelistManagement whitelistManagement : list) {
-            whitelistManagement.setIsTemporary(0);
+        for (WhitelistManagement el : list) {
+            UpdateWrapper<WhitelistManagement> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("id", el.getId());
+            updateWrapper.setSql("end_time = null");
+            updateWrapper.setSql("is_temporary = 0");
+            whitelistManagementService.update(el, updateWrapper);
         }
-        boolean updated = whitelistManagementService.updateBatchById(list);
-        return RT.ok(updated);
+        return RT.ok(true);
     }
 
     @PutMapping