更新加入合同判断

websrc/com/kingdee/eas/custom/esign/service/OnboardingSalaryDataService.java

@@ -56,7 +56,7 @@ public class OnboardingSalaryDataService extends OtherESignConfigDataService {
     	sql.append("WHERE \n");
     	sql.append("    sitem.FNUMBER IN ('TD01', 'T012', 'T013', 'TD02', 'TD04', 'TD74', 'T014', 'TD05', 'TD101') \n");
     	sql.append("    and fas.FLeffectDay = '2199-12-31 00:00:00' \n");
-        
+    	sql.append("    AND  econtract. FState = '1' AND  econtract.FNewState  = '1' AND  econtract.FIsNewestContract = '1'   \n");
         BOSUuid read = BOSUuid.read(id);
         BOSObjectType type = read.getType();
     	 if (type.toString().equals("7BD37592")){//idÀàÐÍΪºÏͬ

websrc/com/kingdee/eas/custom/esign/service/SalaryAdjustmentDataService.java

@@ -103,7 +103,7 @@ public class SalaryAdjustmentDataService extends OtherESignConfigDataService {
     	sql.append("    AND sitem_new.FNUMBER IN ('TD01', 'T012', 'T013', 'TD02', 'TD04', 'TD74', 'T014', 'TD05', 'TD101') \n");
     	// 调薪后记录为永久有效
     	sql.append("    AND new_fas.FLeffectDay = '2199-12-31 00:00:00' \n");
-
+    	sql.append("    AND  econtract. FState = '1' AND  econtract.FNewState  = '1' AND  econtract.FIsNewestContract = '1'   \n");
         BOSUuid read = BOSUuid.read(id);
         BOSObjectType type = read.getType();
     	 if (type.toString().equals("7BD37592")){//id类型为合同