新增用户

lis-framework-util/src/main/java/com/sinosoft/lis/pubfun/PubSubmit.java

@@ -110,9 +110,11 @@ public class PubSubmit {
 				// repeatable read 在使用"DELETE_INSERT"时会出现死锁
 				// 原因在于当多个事务并发时，多个delete出现多个"next-key lock"
 				// 再insert时，由于其他事务的"next-key lock"并没有释放，出现死锁。
-				if (SysConst.getDBTYPE().equals(SysConst.DBTYPE_MYSQL)) {
+				logger.info("dataType{}",SysConst.getDBTYPE());
-					conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
+				//PostgreSQL 根本没有 Gap Lock，也不会产生这种死锁，因此不需要在注释改代码
-				}
+//				if (SysConst.getDBTYPE().equals(SysConst.DBTYPE_MYSQL)) {
+//					conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
+//				}
 			}
 			if (conn == null) {
 				// @@错误处理

lis-module-systemmanage-service/src/main/java/com/sinosoft/lis/sql/userMan/LDUserManBLSSQL.java

@@ -23,7 +23,8 @@ public interface LDUserManBLSSQL {
 
     //new ExeSQL(conn)使用，需要返回SQLwithBindVariables;
     @SQL(value = "select @{0}@{1}@{2} from dual", clauses = {
-            @Clause(key = 0, clause = "USER()", dbType = SysConst.DBTYPE_MYSQL),
+//            @Clause(key = 0, clause = "USER()", dbType = SysConst.DBTYPE_MYSQL),
+            @Clause(key = 0, clause = "current_user|| '@' || inet_client_addr()", dbType = SysConst.DBTYPE_MYSQL),
             @Clause(key = 1, clause = "SYS_CONTEXT('USERENV','CURRENT_USER') || '@' ||SYS_CONTEXT('USERENV', 'IP_ADDRESS')",
                     dbType = SysConst.DBTYPE_ORACLE, incompatible = {Clause.CompatibleType.TDSQLpgO}),
             @Clause(key = 2, clause = "current_user|| '@' || inet_client_addr()",