From d5e3baed7b43fa19026414954486a894f2ad29aa Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 28 Jul 2022 18:08:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E6=97=B6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=BF=85=E9=A1=BB=E5=90=AF=E7=94=A8=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/BasicThirdSysController.java | 9 +++++++++ .../glxp/sale/admin/dao/basic/BasicThirdSysDao.java | 3 ++- .../sale/admin/dao/basic/BussinessLocalTypeDao.java | 4 ---- .../admin/service/basic/BasicThirdSysService.java | 3 +++ .../service/basic/impl/BasicThirdSysServiceImpl.java | 5 +++++ .../mybatis/mapper/basic/BasicThirdSysDao.xml | 11 ++++++++++- 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java index 9058010..6ceae36 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java @@ -101,6 +101,15 @@ public class BasicThirdSysController { } if (basicThirdSysEntity != null) { BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId()); + if (!basicThirdSysEntity.getEnabled()) { + //如操作为禁用第三方系统，则需要判断是否是最后一个启用的第三方系统，需要保留至少启用一个第三方系统 + FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); + filterBasicThirdSysRequest.setEnabled(true); + int count = basicThirdSysService.countThirdSys(filterBasicThirdSysRequest); + if (count == 1) { + return ResultVOUtils.error(500, "至少需需用一个第三方系统！"); + } + } if (temp.getMainSys() != basicThirdSysEntity.getMainSys()) { if (udiRelevanceService.isExit() || unitMaintainService.isExit()) { return ResultVOUtils.error(999, "设置主系统失败"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicThirdSysDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicThirdSysDao.java index 4b1631c..666548c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicThirdSysDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicThirdSysDao.java @@ -1,7 +1,6 @@ package com.glxp.sale.admin.dao.basic; import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.req.basic.FilterBasicThirdSysRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -20,4 +19,6 @@ public interface BasicThirdSysDao { List filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); + int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java index 59eb56d..4a53e3c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java @@ -20,10 +20,6 @@ public interface BussinessLocalTypeDao { List filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); - BussinessLocalTypeEntity findBTByAction(String action); - - BussinessLocalTypeEntity findBTByName(String name); - boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity); boolean insertBussinessType(BussinessLocalTypeEntity bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicThirdSysService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicThirdSysService.java index e49832c..6fc559e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicThirdSysService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicThirdSysService.java @@ -16,4 +16,7 @@ public interface BasicThirdSysService { List filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); BasicThirdSysEntity selectMainThrSys(); + + int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicThirdSysServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicThirdSysServiceImpl.java index 67ad5d7..6db260f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicThirdSysServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicThirdSysServiceImpl.java @@ -80,4 +80,9 @@ public class BasicThirdSysServiceImpl implements BasicThirdSysService { } return null; } + + @Override + public int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest) { + return basicThirdSysDao.countThirdSys(filterBasicThirdSysRequest); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml index 6d4d189..6a31953 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -41,7 +41,7 @@ AND thirdName = #{thirdName} - + AND enabled = #{enabled} @@ -54,4 +54,13 @@ FROM basic_third_sys WHERE thirdId = #{thirdId} + + \ No newline at end of file