Merge branch 'jenkins_with_weblogic' into devs/gw-metrics

# Conflicts: # src/main/java/com/eactive/eai/rms/onl/transaction/apim/mapping/ApiInterfaceUIMapper.java
2025-12-09 09:14:03 +09:00
parent cfeda1b7af 57fde15597
commit ada110ce91
145 changed files with 76106 additions and 37 deletions
@@ -90,7 +90,7 @@ public class MenuService extends AbstractEMSDataSerivce<Menu, String, MenuReposi
            .where( qUserRole.id.userId.eq(userId),
                  qMenu.menuUrl.like(url.concat("%")), qRole.useYn.eq("Y"),
                  qRoleMenuAuth.auth.in("R", "W"),
-                  qRoleMenuAuth.id.serviceType.eq(serviceType)
+                  serviceType != null ? qRoleMenuAuth.id.serviceType.eq(serviceType) : qRoleMenuAuth.id.serviceType.isNull()
            )
 				.setHint(QueryHints.CACHEABLE, true)
 				.fetchOne();