From fd8bc5e158d2023532f6da4c3e8153f3636a12bd Mon Sep 17 00:00:00 2001 From: xxxxxwwwww <3040838740@qq.com> Date: Wed, 30 Mar 2022 22:28:49 +0800 Subject: [PATCH] Merge branch 'master' of D:\operation-control-platform with conflicts. --- .../com/pms/ocp/service/impl/AppRegisterServiceImpl.java | 5 +++-- src/main/resources/application-local.yml | 2 +- src/main/resources/mapper/OcpTenantBaseMapper.xml | 5 ----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java index c0ddead..84f6f31 100644 --- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java @@ -51,8 +51,9 @@ public class AppRegisterServiceImpl implements AppRegisterService { int count = ocpTenantBaseMapper.queryCount(appRegisterDTO.getAppCode()); int c = ocpTenantExtentMapper.queryCount(appRegisterDTO.getAppCode()); - if (count != 0 || c != 0) { - return ResponseVO.error("应用编码有重复/应用扩展表编码有重复"); + int nc = ocpTenantBaseMapper.queryName(appRegisterDTO.getAppName()); + if (count != 0 || c != 0 || nc != 0) { + return ResponseVO.error("应用编码有重复/应用扩展表编码有重复/应用名称有重复"); } OcpTenantIocn ocpTenantIocn = new OcpTenantIocn(); diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 0f73a77..1463601 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,7 +2,7 @@ spring: datasource: driver-class-name: org.postgresql.Driver username: postgres - password: 1234 + password: root type: com.zaxxer.hikari.HikariDataSource # jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml index 752b4ee..5bc95ff 100644 --- a/src/main/resources/mapper/OcpTenantBaseMapper.xml +++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml @@ -32,10 +32,5 @@ where tenant_code = #{appCode} - \ No newline at end of file -- 2.26.0