diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java
index 06635f14..c4edd3a5 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java
@@ -120,7 +120,7 @@ public class XmMyFocusController {
 			xmMyFocus.setUsername(user.getUsername());
 			xmMyFocus.setUbranchId(user.getBranchId());
 			if(xmMyFocusService.selectOneObject(xmMyFocus) !=null ){
-				return failed("pk-exists","编号重复，请修改编号再提交");
+				return failed("pk-exists","已关注");
 			}
 			xmMyFocusService.focus(xmMyFocus);
 			m.put("data",xmMyFocus);
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java
index baba0aeb..62460f3f 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java
@@ -42,6 +42,9 @@ public class XmMyFocusService extends BaseService {
 		}else if("5".equals(xmMyFocus.getFocusType())) {
 			xmRecordService.addXmTaskRecord(xmMyFocus.getPbizId(), xmMyFocus.getBizId(), "项目-缺陷-取消关注缺陷", xmMyFocus.getUsername()+"取消关注了缺陷"+xmMyFocus.getBizName());
 
+		}else if("6".equals(xmMyFocus.getFocusType())) {
+			xmRecordService.addXmIterationRecord( xmMyFocus.getBizId(), "迭代-取消关注", xmMyFocus.getUsername()+"取消关注迭代"+xmMyFocus.getBizName());
+
 		}else {
 			throw new BizException("focusType参数必须上传，取值project/task");
 		}
@@ -70,8 +73,11 @@ public class XmMyFocusService extends BaseService {
 		}else if("5".equals(xmMyFocus.getFocusType())) {
 			xmRecordService.addXmTaskRecord(xmMyFocus.getPbizId(), xmMyFocus.getBizId(), "项目-缺陷-关注缺陷", xmMyFocus.getUsername()+"关注了缺陷"+xmMyFocus.getBizName());
 
+		}else if("6".equals(xmMyFocus.getFocusType())) {
+			xmRecordService.addXmIterationRecord( xmMyFocus.getBizId(), "迭代-关注", xmMyFocus.getUsername()+"关注了迭代"+xmMyFocus.getBizName());
+
 		}else {
-			 throw new BizException("focusType参数必须上传，取值project/task");
+			 throw new BizException("focusType参数必须上传，取值1、2、3、4、5、6");
 		 } 
 		
 	}