From e4755736da6b641e45cef9951f2b381401f42d8d Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Fri, 21 Oct 2022 18:09:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B910=E6=9C=8821=E5=8F=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicThirdSysController.java | 33 +++++++++++-------- .../sale/admin/util/SupplementVailUtil.java | 10 +++--- .../mybatis/mapper/auth/UserRegisterDao.xml | 2 +- scripts/vue-admin-zz.sql | 3 ++ 4 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 scripts/vue-admin-zz.sql 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 5087644..4c9a723 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 @@ -107,7 +107,9 @@ public class BasicThirdSysController { filterBasicThirdSysRequest.setEnabled(true); int count = basicThirdSysService.countThirdSys(filterBasicThirdSysRequest); if (count == 1) { - return ResultVOUtils.error(500, "至少需需用一个第三方系统！"); + if(temp.getEnabled()) { + return ResultVOUtils.error(500, "至少需需用一个第三方系统！"); + } } } @@ -116,19 +118,24 @@ public class BasicThirdSysController { } - if (temp.getMainSys() != basicThirdSysEntity.getMainSys()) { - if (udiRelevanceService.isExit() || unitMaintainService.isExit()) { - return ResultVOUtils.error(999, "设置主系统失败"); - } - if ((!temp.getEnabled()) && basicThirdSysEntity.getMainSys()) { - if (!basicThirdSysEntity.getEnabled()) { - return ResultVOUtils.error(999, "请先启用系统！"); - } - } - if (!basicThirdSysEntity.getEnabled() && basicThirdSysEntity.getMainSys()) { - return ResultVOUtils.error(999, "请先启用系统！"); - } + if(!basicThirdSysEntity.getMainSys() && temp.getMainSys()){ + return ResultVOUtils.error(500, "至少需需用一个第三方主系统！"); } + + +// if (temp.getMainSys() != basicThirdSysEntity.getMainSys()) { +// if (udiRelevanceService.isExit() || unitMaintainService.isExit()) { +// return ResultVOUtils.error(999, "设置主系统失败"); +// } +// if ((!temp.getEnabled()) && basicThirdSysEntity.getMainSys()) { +// if (!basicThirdSysEntity.getEnabled()) { +// return ResultVOUtils.error(999, "请先启用系统！"); +// } +// } +// if (!basicThirdSysEntity.getEnabled() && basicThirdSysEntity.getMainSys()) { +// return ResultVOUtils.error(999, "请先启用系统！"); +// } +// } if (basicThirdSysEntity.getMainSys()) { List basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(new FilterBasicThirdSysRequest()); for (BasicThirdSysEntity basicThirdSysEntity1 : basicThirdSysEntities) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/SupplementVailUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/SupplementVailUtil.java index 2e814f7..2f54050 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/SupplementVailUtil.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/SupplementVailUtil.java @@ -49,33 +49,33 @@ public class SupplementVailUtil { } basicProductSetEntity = basicProductSetEntityMap.get("measname"); if (isMustFill(type, basicProductSetEntity)) { - if (StrUtil.isEmpty(supplementRequest.getMeasname())) { + if (StrUtil.isEmpty(supplementRequest.getMeasname().trim())) { return "计量单位不能为空"; } } basicProductSetEntity = basicProductSetEntityMap.get("manufactory"); if (isMustFill(type, basicProductSetEntity)) { - if (StrUtil.isEmpty(supplementRequest.getManufactory())) { + if (StrUtil.isEmpty(supplementRequest.getManufactory().trim())) { return "生产厂家不能为空"; } } basicProductSetEntity = basicProductSetEntityMap.get("spmc"); if (isMustFill(type, basicProductSetEntity)) { - if (StrUtil.isEmpty(supplementRequest.getSpmc())) { + if (StrUtil.isEmpty(supplementRequest.getSpmc().trim())) { return "商品名称不能为空"; } } basicProductSetEntity = basicProductSetEntityMap.get("cpms"); if (isMustFill(type, basicProductSetEntity)) { - if (StrUtil.isEmpty(supplementRequest.getCpms())) { + if (StrUtil.isEmpty(supplementRequest.getCpms().trim())) { return "产品描述不能为空"; } } basicProductSetEntity = basicProductSetEntityMap.get("price"); if (isMustFill(type, basicProductSetEntity)) { - if (StrUtil.isEmpty(supplementRequest.getPrice())) { + if (StrUtil.isEmpty(supplementRequest.getPrice().trim())) { return "产品价格不能为空"; } } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml index ce9745c..ccffdd8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml @@ -97,7 +97,7 @@ SELECT 1 FROM user_register WHERE ( - mobile = #{phoneNum}) limit 1 + mobile = #{phoneNum} and checkType !=2 ) limit 1 \ No newline at end of file diff --git a/scripts/vue-admin-zz.sql b/scripts/vue-admin-zz.sql new file mode 100644 index 0000000..4373156 --- /dev/null +++ b/scripts/vue-admin-zz.sql @@ -0,0 +1,3 @@ +/** 2022-10-20 **/ +ALTER TABLE `udi`.`thr_order` +ADD COLUMN `thirdPartyDate` tinyint(0) NULL DEFAULT NULL COMMENT '判断来源至哪里1：第三方 2：自己创建' AFTER `manufactory`; \ No newline at end of file