Merge branch 'master' of D:\operation-control-platform with conflicts.

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();

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

src/main/resources/mapper/OcpTenantBaseMapper.xml

@@ -32,10 +32,5 @@
         where tenant_code = #{appCode}
     </select>
 
-    <select id="selcctCodeList" resultType="java.lang.Integer">
-        select *
-        from ocp_tenant_base
-        where tenant_group_code = #{ocpTenantGroup}
-    </select>
 
 </mapper>
\ No newline at end of file