sunhh 1 anno fa
parent
commit
4a45006f04

+ 13 - 5
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraVersionController.java

@@ -1,5 +1,6 @@
 package com.ozs.web.controller.accountmanagment;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
@@ -135,11 +136,18 @@ public class BaseCameraVersionController extends BaseController {
         if (StringUtils.isEmptySunhh(ids)) {
             return AjaxResult.error("删除ID不能为空!");
         }
-        boolean delete = baseCameraVersionService.removeByIds(ids);
-        if (delete) {
-            return AjaxResult.success();
-        } else {
-            return AjaxResult.error();
+        for (Long id : ids) {
+            LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
+            if (!StringUtils.isEmptySunhh(id)) {
+                wrapper.eq(BaseCameraManagement::getVersionId, id);
+            }
+            List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
+            if (!StringUtils.isEmptySunhh(list) && list.size() > 0) {
+                return AjaxResult.error("删除ID: " + id + ",已经升级了相机,不能删除!");
+            }
+            boolean delete = baseCameraVersionService.removeById(id);
         }
+        // boolean delete = baseCameraVersionService.removeByIds(ids);
+        return AjaxResult.success();
     }
 }