diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java
index 28494a0..11ea7ab 100644
--- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java
+++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java
@@ -24,9 +24,12 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -430,37 +433,49 @@ public class SysMgtController {
 	 */
 	@RequestMapping(value = "/setWorkState", method = {RequestMethod.POST})
 	@ResponseBody
-	public SetWorkStateResDto setWorkState(@RequestBody @Valid SetWorkStateReqDto setWorkParam, BindingResult bindingResult) {
+	public SetWorkStateResDto setWorkState(@RequestBody @Valid SetWorkStateReqDto setWorkParam, BindingResult bindingResult,
+			HttpServletRequest request) {
 	
 		if (validComponents.validParameter(bindingResult)) {
 			return new SetWorkStateResDto(ApiResponseCode.CM_PARAMETER_ERROR);
 		}
 		
-//		String ip = request.getHeader("X-Forwarded-For");
-//	    logger.info("> X-FORWARDED-FOR : " + ip);
-//
-//	    if (ip == null) {
-//	        ip = request.getHeader("Proxy-Client-IP");
-//	        logger.info("> Proxy-Client-IP : " + ip);
-//	    }
-//	    if (ip == null) {
-//	        ip = request.getHeader("WL-Proxy-Client-IP");
-//	        logger.info(">  WL-Proxy-Client-IP : " + ip);
-//	    }
-//	    if (ip == null) {
-//	        ip = request.getHeader("HTTP_CLIENT_IP");
-//	        logger.info("> HTTP_CLIENT_IP : " + ip);
-//	    }
-//	    if (ip == null) {
-//	        ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-//	        logger.info("> HTTP_X_FORWARDED_FOR : " + ip);
-//	    }
-//	    if (ip == null) {
-//	        ip = request.getRemoteAddr();
-//	        logger.info("> getRemoteAddr : "+ip);
-//	    }
-//	    logger.info("> Result : IP Address : "+ip);
-//	    setWorkParam.setIp(ip);
+		String ip = request.getHeader("X-Forwarded-For");
+	    logger.info("> X-FORWARDED-FOR : " + ip);
+
+	    if (ip == null) {
+	        ip = request.getHeader("Proxy-Client-IP");
+	        logger.info("> Proxy-Client-IP : " + ip);
+	    }
+	    if (ip == null) {
+	        ip = request.getHeader("WL-Proxy-Client-IP");
+	        logger.info(">  WL-Proxy-Client-IP : " + ip);
+	    }
+	    if (ip == null) {
+	        ip = request.getHeader("HTTP_CLIENT_IP");
+	        logger.info("> HTTP_CLIENT_IP : " + ip);
+	    }
+	    if (ip == null) {
+	        ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+	        logger.info("> HTTP_X_FORWARDED_FOR : " + ip);
+	    }
+	    if (ip == null) {
+	        ip = request.getRemoteAddr();
+	        logger.info("> getRemoteAddr : "+ip);
+	    }
+	    
+	    if (ip.equals("0:0:0:0:0:0:0:1") || ip.equals("127.0.0.1")) {
+	    	InetAddress address;
+			try {
+				address = InetAddress.getLocalHost();
+				ip = address.getHostName() + "/" + address.getHostAddress();
+			} catch (UnknownHostException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+	    }
+	    logger.info("> Result : IP Address : "+ip);
+	    setWorkParam.setIp(ip);
 	    
 		return sysService.setWorkState(setWorkParam);
 	}
@@ -492,4 +507,7 @@ public class SysMgtController {
 		return sysService.selectAuthMemuListForAddAuth();
 	}
 	
+	
+	
+
 }
diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java
index aaf9b47..94d70de 100644
--- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java
+++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java
@@ -585,8 +585,8 @@ public class SysMgtService {
 		setWorkState += setWorkParam.getStartTimeT() + "@";
 		setWorkState += setWorkParam.getStartTimeM() + "@";
 		setWorkState += setWorkParam.getEndTimeT() + "@";
-		setWorkState += setWorkParam.getEndTimeM();
-//		setWorkState += setWorkParam.getIp();
+		setWorkState += setWorkParam.getEndTimeM() + "@";
+		setWorkState += setWorkParam.getIp();
 		
 		
 		try {