退回兼容国家新建库区

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -341,6 +341,12 @@ public class DwxxServiceImpl implements DwxxService {
             if (ObjectUtils.isEmpty(caxxDOS)){
                 dwxxMapper.deleteById(updateReqVO.getDeptId());
                 kqxxMapper.deleteById(updateReqVO.getKqId());
+                CwxxDO cwxxDO = cwxxMapper.selectBYKqId(updateReqVO.getKqId());
+                if (!ObjectUtil.isEmpty(cwxxDO)){
+                    Long cwxxDOId = cwxxDO.getId();
+                    cwxxMapper.deleteById(cwxxDOId);
+                    cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
+                }
             }
         }
         if ("1".equals(areaLevel)) {
@@ -366,6 +372,7 @@ public class DwxxServiceImpl implements DwxxService {
                         CwxxDO cwxxDO = cwxxMapper.selectBYKqId(updateReqVO.getKqId());
                         if (!ObjectUtil.isEmpty(cwxxDO)){
                             Long cwxxDOId = cwxxDO.getId();
+                            cwxxMapper.deleteById(cwxxDOId);
                             cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
                         }
                     }