Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev

src/main/java/com/baosight/hggp/hg/xs/sql/HGXSOrg.xml

@@ -4,9 +4,9 @@
 
     <sql id="condition">
         AND IS_DELETED = '0'
-        <isNotEqual prepend=" AND " property="accountCode" compareValue="ADMIN">
+        <isNotEmpty prepend=" AND " property="accountCode">
             ACCOUNT_CODE = #accountCode#
-        </isNotEqual>
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="orgEname">
             ORG_ENAME = #orgEname#
         </isNotEmpty>
@@ -83,9 +83,9 @@
         (SELECT @CODES:=GROUP_CONCAT(ORG_ID)
         FROM ${platSchema}.TXSOG01
         WHERE FIND_IN_SET(PARENT_ORG_ID, @CODES)
-        <isNotEqual property="accountCode" compareValue="ADMIN">
-            AND ACCOUNT_CODE = #accountCode#
-        </isNotEqual>
+        <isNotEmpty prepend=" AND " property="accountCode">
+            ACCOUNT_CODE = #accountCode#
+        </isNotEmpty>
         AND IS_DELETED = 0
         ) AS T1,
         @LEVEL:=@LEVEL+1 AS LEVEL

src/main/java/com/baosight/iplat4j/core/data/ibatis/dao/SqlMapDaoLogProxy.java

@@ -192,7 +192,13 @@ public class SqlMapDaoLogProxy extends SqlMapDao {
 		}
 		// 本来是BUG，避免业务代码改动依然保持原逻辑ADMIN时依然置空
 		String accountCode = UserSessionUtils.getAccountCode();
-		((Map) parameters).put("accountCode", CommonConstant.Field.ADMIN.equals(accountCode) ? "" : accountCode);
+		if (CommonConstant.Field.ADMIN.equals(accountCode)) {
+			((Map) parameters).put("accountCode", null);
+		} else if (StringUtils.isBlank(accountCode)) {
+			((Map) parameters).put("accountCode", " ");
+		} else {
+			((Map) parameters).put("accountCode", accountCode);
+		}
 	}
 	
 	/**

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0800.java

@@ -59,7 +59,7 @@ public class ServiceXSOG0800 extends TreeService {
 		queryMap.put("node", parentLabel);
 		// 非管理员仅查询所属企业用户 added by songx at 2024-01-16
 		queryMap.put("accountCode", LoginUserDetails.isUserAdmin(UserSessionUtils.getLoginName())
-				? CommonConstant.Field.ADMIN : UserSessionUtils.getAccountCode());
+				? null : UserSessionUtils.getAccountCode());
 		List<Map> ret = this.dao.query("XSOG01.queryOrganiation", queryMap, 0, -999999);
 		Map parentOrgMap = new HashMap();
 		

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801.java

@@ -410,7 +410,7 @@ public class ServiceXSOG0801 extends ServiceBase {
 			}
 			// 非管理员仅查询所属企业用户 added by songx at 2024-01-16
 			inInfo.set("inqu_status-0-accountCode", LoginUserDetails.isUserAdmin(UserSessionUtils.getLoginName())
-					? CommonConstant.Field.ADMIN : UserSessionUtils.getAccountCode());
+					? null : UserSessionUtils.getAccountCode());
 			EiInfo outInfo = super.query(inInfo, "XSOG01.query", new XSOG01());
 			r2Block.setRows(outInfo.getBlock(EiConstant.resultBlock).getRows());
 			outInfo.addBlock(r2Block);

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801A.java

@@ -92,7 +92,7 @@ public class ServiceXSOG0801A extends ServiceEPBase {
 			}
 			// 非管理员仅查询所属企业用户 added by songx at 2024-01-16
 			queryMap.put("accountCode", LoginUserDetails.isUserAdmin(UserSessionUtils.getLoginName())
-					? CommonConstant.Field.ADMIN : UserSessionUtils.getAccountCode());
+					? null : UserSessionUtils.getAccountCode());
 			inInfo = super.query(inInfo, "XSOG01.query", new XSOG01());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801B.java

@@ -84,7 +84,7 @@ public class ServiceXSOG0801B extends ServiceEPBase {
 			}
 			// 非管理员仅查询所属企业用户 added by songx at 2024-01-16
 			queryMap.put("accountCode", LoginUserDetails.isUserAdmin(UserSessionUtils.getLoginName())
-					? CommonConstant.Field.ADMIN : UserSessionUtils.getAccountCode());
+					? null : UserSessionUtils.getAccountCode());
 			inInfo = super.query(inInfo, "XSOG01.query", new XSOG01());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/java/com/baosight/xservices/xs/og/sql/XSOG01.xml

@@ -158,9 +158,9 @@
         <isNotEmpty prepend=" AND " property="orgType">
             ORG_TYPE like ('%$orgType$%')
         </isNotEmpty>
-        <isNotEqual prepend=" AND " property="accountCode" compareValue="ADMIN">
+        <isNotEmpty prepend=" AND " property="accountCode">
             ACCOUNT_CODE = #accountCode#
-        </isNotEqual>
+        </isNotEmpty>
         ORDER BY SORT_INDEX ASC
     </select>
 
@@ -185,9 +185,9 @@
         <isNotEmpty prepend=" AND " property="orgType">
             ORG_TYPE like ('%$orgType$%')
         </isNotEmpty>
-        <isNotEqual prepend=" AND " property="accountCode" compareValue="ADMIN">
+        <isNotEmpty prepend=" AND " property="accountCode">
             ACCOUNT_CODE = #accountCode#
-        </isNotEqual>
+        </isNotEmpty>
     </select>
 
     <!-- 根据id查询组织机构 -->
@@ -279,9 +279,9 @@
         <isNotEmpty prepend=" AND " property="node">
             PARENT_ORG_ID = #node#
         </isNotEmpty>
-        <isNotEqual prepend=" AND " property="accountCode" compareValue="ADMIN">
+        <isNotEmpty prepend=" AND " property="accountCode">
             ACCOUNT_CODE = #accountCode#
-        </isNotEqual>
+        </isNotEmpty>
         order by SORT_INDEX asc
     </select>
 

src/main/resources/application.properties

@@ -21,10 +21,10 @@ projectName=hggp
 moduleName=ep
 projectEnv=dev
 platSchema=iplat_hggp
-eplatSchema=EPLAT
-lowcodedbSchema=lowcodedb
-lowCodeSchema=LOWCODEDB
-projectSchema=LOWCODEDB
+eplatSchema=EPLAT_HGGP
+lowcodedbSchema=lowcodedb_hggp
+lowCodeSchema=LOWCODEDB_HGGP
+projectSchema=LOWCODEDB_HGGP
 metaSchema=hggp
 hggpSchema=hggp
 
@@ -34,11 +34,11 @@ customerName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 enterpriseName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 datasource.type=dbcp
 jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
 jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
 #jdbc.username=hggp
 jdbc.username=root
-#jdbc.password=hggp123!@#
+#jdbc.password=hggp_Twhxz2024Aly
 jdbc.password=Whxz@2019
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00

src/main/resources/quartz.properties

@@ -26,12 +26,12 @@ org.quartz.jobStore.isClustered = true
 #\uFFFD\u02F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u077F\uFFFD\u05BE\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\u0635\uFFFD\uFFFD\uFFFD\u03E2
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.cj.jdbc.Driver
+#org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
 org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#org.quartz.dataSource.appDS.URL = jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
-org.quartz.dataSource.appDS.user =root
-#org.quartz.dataSource.appDS.user = root
-org.quartz.dataSource.appDS.password =Whxz@2019
-#org.quartz.dataSource.appDS.password =123456
+#org.quartz.dataSource.appDS.user = hggp
+org.quartz.dataSource.appDS.user = root
+#org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
+org.quartz.dataSource.appDS.password = Whxz@2019
 org.quartz.dataSource.appDS.maxConnections = 30
 
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B1\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u00BC\uFFFD\uFFFD\uFFFD