修改10月21号bug

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<BasicThirdSysEntity> basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(new FilterBasicThirdSysRequest());
                 for (BasicThirdSysEntity basicThirdSysEntity1 : basicThirdSysEntities) {

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 "产品价格不能为空";
                 }
             }

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
 
     </select>
 </mapper>

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`;