From 9655ea9ce8cdd671a766f87a0885b0fdff7b89c9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Aug 2023 17:12:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java
index 98c4569..17c4ef3 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java
@@ -11,7 +11,10 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.ManageCoordinate;
+import com.moral.api.entity.ManageCoordinateDetail;
+import com.moral.api.mapper.ManageCoordinateDetailMapper;
import com.moral.api.mapper.ManageCoordinateMapper;
+import com.moral.api.service.ManageCoordinateDetailService;
import com.moral.api.service.ManageCoordinateService;
@@ -20,6 +23,9 @@
@Autowired
private ManageCoordinateMapper manageCoordinateMapper;
+
+ @Autowired
+ private ManageCoordinateDetailMapper manageCoordinateDetailMapper;
/**
* ������������
@@ -62,9 +68,16 @@
* @param id
*/
@Override
- public void deleteCoordinate(Integer id) {
-
+ public Integer deleteCoordinate(Integer id) {
+ QueryWrapper<ManageCoordinateDetail> wrapper = new QueryWrapper<>();
+ wrapper.eq("coordinate_id",id);
+ Integer integer = manageCoordinateDetailMapper.selectCount(wrapper);
+ if (integer>0){
+ return 1;
+ }
manageCoordinateMapper.deleteById(id);
+ return 200;
+
}
/**
--
Gitblit v1.8.0