diff --git a/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp b/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp
index 65d763e3f..d51d92f14 100644
--- a/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp
+++ b/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp
@@ -23,6 +23,13 @@
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
+	setItemValue(0,0,"UpdateUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"UpdateOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"UpdateTime","<%=StringFunction.getTodayNow()%>");
+	
 	function returnList(){
 		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
 	}
diff --git a/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp b/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp
index 909fd6f6b..78512f23a 100644
--- a/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp
+++ b/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp
@@ -16,7 +16,7 @@
 	String sButtons[][] = {
 		{"true","All","Button","ÐÂÔö","ÐÂÔö","newRecord()","","","","btn_icon_add",""},
 		{"true","","Button","ÏêÇé","ÏêÇé","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","ɾ³ý","ɾ³ý","if(confirm('ȷʵҪɾ³ýÂð?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		{"true","","Button","ɾ³ý","ɾ³ý","if(confirm('ȷʵҪɾ³ýÂð?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/src_tenwa/com/tenwa/apzl/commission/commissionSet.java b/src_tenwa/com/tenwa/apzl/commission/commissionSet.java
index 5704b6096..e3e0c4a8f 100644
--- a/src_tenwa/com/tenwa/apzl/commission/commissionSet.java
+++ b/src_tenwa/com/tenwa/apzl/commission/commissionSet.java
@@ -14,11 +14,17 @@ import com.amarsoft.are.jbo.JBOTransaction;
 import com.amarsoft.awe.util.ASResultSet;
 import com.amarsoft.awe.util.SqlObject;
 import com.amarsoft.awe.util.Transaction;
-
+/**
+ * 
+ * @author liuzhao
+ *
+ */
 public class commissionSet {
 
 	public String effectStart;
 	public String leasForm;
+	public String endDate;
+	public String startDate;
 	
 	public String getEffectStart() {
 		return effectStart;
@@ -36,15 +42,28 @@ public class commissionSet {
 		this.leasForm = leasForm;
 	}
 
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
 	public String commissionSet() throws Exception{
 		JBOTransaction tx=null;
 		Transaction  Sqlca=null;
 		tx= JBOFactory.createJBOTransaction();
 		Sqlca=Transaction.createTransaction(tx);
 		
-		/*BizObjectManager lpsManager = JBOFactory.getBizObjectManager(LB_PRODUCT_SALVAGE.CLASS_NAME);
-		BizObject lpsObject = lpsManager.createQuery("id=:id").setParameter("id", this.getId()).getSingleResult(false);
-		String leasForm = lpsObject.getAttribute("product_id").toString();*/
 		int end = 0;
 		String sql="SELECT MAX(effect_end) AS effect_end FROM LB_PRODUCT_SALVAGE where product_id=:product_id";
 		SqlObject asql = new SqlObject(sql).setParameter("product_id", leasForm);
@@ -68,4 +87,35 @@ public class commissionSet {
 			return "success";
 		}
 	}
+	
+	public String editEnd() throws Exception{
+		JBOTransaction tx=null;
+		Transaction  Sqlca=null;
+		tx= JBOFactory.createJBOTransaction();
+		Sqlca=Transaction.createTransaction(tx);
+		
+		int start = 0;
+		String sql="SELECT MIN(effect_start) AS effect_start FROM LB_PRODUCT_SALVAGE WHERE product_id=:product_id AND effect_start>:effect_start";
+		SqlObject asql = new SqlObject(sql).setParameter("product_id", leasForm).setParameter("effect_start", startDate);
+		try {
+			ASResultSet rs =  Sqlca.getResultSet(asql);
+			if(rs.next()){
+				String effectStart = rs.getString(1);
+				effectStart = effectStart.replaceAll("/", "");
+				start = Integer.parseInt(effectStart);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	
+	    String endDate = this.getEndDate();
+	    endDate = endDate.replaceAll("/", "");
+		int end = Integer.parseInt(endDate);
+		
+		if(end>=start){
+			return "fail";
+		}else{
+			return "success";
+		}
+	}
 }