diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
index c1b5f19..8cdfffd 100644
--- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
+++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
@@ -283,10 +283,10 @@ public class CtrCntrlService {
 				model.setCreateUserId(warnLog.getCreateUserId());
 			}
 
-			if(control.getCntrlId()!=null) return result;
-			model.setCntrlId(control.getCntrlId());
-			model.setIdntfNum(control.getIdntfNum());
-			model.setWarnCount(warnCount);
+			
+			if(control.getCntrlId()!=null) model.setCntrlId(control.getCntrlId());
+			if(control.getIdntfNum()!=null) model.setIdntfNum(control.getIdntfNum());
+			if(warnCount!=null) model.setWarnCount(warnCount);
 
 			result.add(model);
 		}