bug修改

api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java

@@ -119,6 +119,9 @@ public class BasicThirdSysController {
             if (exists) {
                 return ResultVOUtils.error(500, "第三方系统名称重复");
             }
+
+            BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId());
+
             if (!basicThirdSysEntity.getEnabled()) {
                 //如操作为禁用第三方系统，则需要判断是否是最后一个启用的第三方系统，需要保留至少启用一个第三方系统
                 FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
@@ -129,7 +132,12 @@ public class BasicThirdSysController {
                 }
             }
 
-            BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId());
+
+            if (temp.getMainSys() && !temp.getEnabled()) {
+                return ResultVOUtils.error(500, "主系统必须启用");
+            }
+
+
             if (!temp.getMainSys().equals(basicThirdSysEntity.getMainSys())) {
                 if (udiRelevanceService.isExit() || unitMaintainService.isExit()) {
                     return ResultVOUtils.error(999, "产品信息已经关联，无法取消主系统！");

api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java

@@ -113,6 +113,13 @@ public class BussinessOriginTypeController {
         }
         if (bussinessTypeEntity != null) {
             bussinessTypeEntity.setUpdateTime(new Date());
+
+
+            BussinessOriginTypeEntity bussinessOriginTypeEntity = bussinessOriginTypeService.findByAction(bussinessTypeEntity.getAction());
+            if (bussinessOriginTypeEntity != null) {
+                return ResultVOUtils.error(500, "单据类型已存在！");
+            }
+
             bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity);
         } else {
             return ResultVOUtils.error(999, "参数错误");