Merge branch 'staging' into devs/safedb-password_encoder

WebContent/WEB-INF/weblogic.xml

@@ -13,7 +13,7 @@
   
   <container-descriptor>
     <prefer-application-packages>
-      <packate-name>org.apach.ignite.*</packate-name>
+      <package-name>org.apach.ignite.*</package-name>
       <package-name>org.slf4j.*</package-name>
       <package-name>ch.qos.logback.*</package-name>
     </prefer-application-packages>

build.gradle

@@ -76,6 +76,7 @@ dependencies {
     implementation project(':elink-online-common')
 	implementation project(':elink-online-emsclient')
 	implementation project(':elink-portal-common')
+	implementation project(':kjb-safedb')
 
     /* Custom Libs */
     implementation fileTree(dir: 'libs', include: ['*.jar'])

settings.gradle

@@ -12,4 +12,8 @@ project (':elink-online-core').projectDir = new File(settingsDir, "../eapim-onli
 project (':elink-online-transformer').projectDir = new File(settingsDir, "../eapim-online/elink-online-transformer")
 project (':elink-online-common').projectDir = new File(settingsDir, "../eapim-online/elink-online-common")
 project (':elink-online-emsclient').projectDir = new File(settingsDir, "../eapim-online/elink-online-emsclient")
-project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common")
+project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common")
+
+
+include 'kjb-safedb'
+project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb")

src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java

@@ -103,7 +103,7 @@ public class PortalApprovalManService extends BaseService {
             Optional<PortalUser> optUser = portalUserRepository.findById(approval.getTargetId());
             optUser.ifPresent(user -> {
                 PortalUserUI userUI = isMasked ?
-                    portalUserManService.selectDetail(user.getId()) :
+                    portalUserManService.selectDetail(user.getId(), true) :
                     portalUserManService.selectDetailUnmask(user.getId());
 
                 // IP 마스킹 상태만 재설정