From d451e0e6723e9cafb0f0b330b8f3f0444689761f Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Tue, 25 Jun 2024 14:00:16 +0900
Subject: [PATCH] =?UTF-8?q?UserController=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/base/UserController.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cokr/xit/fims/base/UserController.java b/src/main/java/cokr/xit/fims/base/UserController.java
index 60ecae9e..1004944d 100644
--- a/src/main/java/cokr/xit/fims/base/UserController.java
+++ b/src/main/java/cokr/xit/fims/base/UserController.java
@@ -40,7 +40,20 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 
 	@Override
 	public ModelAndView getInfo(String userID) {
-		ModelAndView mav = super.getInfo(userID);
+
+		ModelAndView mav = new ModelAndView();
+
+		boolean json = !isEmpty(userID) && jsonResponse();
+		String viewName = json ? "jsonView" : "base/user/user-info";
+
+		if (!isEmpty(userID)) {
+			DataObject userInfo = userService.getUserInfo(userID);
+			mav.setViewName(viewName);
+			mav.addObject("userInfo", json ? userInfo : toJson(userInfo));
+		} else {
+			mav.setViewName("base/user/user-info");
+
+		}
 
 		mav.addObject("allOgdpList", fimsOgdpBean.selectAllOgdpList());