fenglinyong %!s(int64=2) %!d(string=hai) anos
pai
achega
eeaa6e0b0f
Modificáronse 1 ficheiros con 7 adicións e 7 borrados
  1. 7 7
      DK.Service/HRModuleLogic/HRModuleDAL.cs

+ 7 - 7
DK.Service/HRModuleLogic/HRModuleDAL.cs

@@ -708,7 +708,7 @@ namespace Dongke.IBOSS.PRD.Service.HRModuleLogic
             try
             try
             {
             {
                 oracleTrConn.Connect();
                 oracleTrConn.Connect();
-                string sql = "SELECT Count(*) FROM TP_HR_STAFF WHERE staffid=" + staffid + " AND StaffStatus in(0,3) AND ValueFlag=1";
+                string sql = "SELECT Count(*) FROM TP_HR_STAFF WHERE staffid=" + staffid + " AND ValueFlag=1";
                 string strCount = oracleTrConn.GetSqlResultToStr(sql);
                 string strCount = oracleTrConn.GetSqlResultToStr(sql);
                 if (!"0".Equals(strCount))
                 if (!"0".Equals(strCount))
                 {
                 {
@@ -716,15 +716,15 @@ namespace Dongke.IBOSS.PRD.Service.HRModuleLogic
                             + " WHERE staffid=" + staffid;
                             + " WHERE staffid=" + staffid;
                     resultEnity.OperateStatus = oracleTrConn.ExecuteNonQuery(sqlString);
                     resultEnity.OperateStatus = oracleTrConn.ExecuteNonQuery(sqlString);
 
 
-                    string sqlString2 = "Select StaffRecordID From TP_HR_StaffRecord "
-                            + " Where ApprovalStatus = 0 AND RecordType = 1 And ValueFlag = 1 And StaffID = " + staffid;
-                    string strStaffRecordID = oracleTrConn.GetSqlResultToStr(sqlString2);
-                    if (!string.IsNullOrEmpty(strStaffRecordID))
-                    {
+                    //string sqlString2 = "Select StaffRecordID From TP_HR_StaffRecord "
+                    //        + " Where ApprovalStatus = 0 AND RecordType = 1 And ValueFlag = 1 And StaffID = " + staffid;
+                    //string strStaffRecordID = oracleTrConn.GetSqlResultToStr(sqlString2);
+                    //if (!string.IsNullOrEmpty(strStaffRecordID))
+                    //{
                         string sqlString3 = "Update TP_HR_StaffRecord Set ValueFlag = 0,UpdateUserID = " + sUserInfo.UserID
                         string sqlString3 = "Update TP_HR_StaffRecord Set ValueFlag = 0,UpdateUserID = " + sUserInfo.UserID
                             + " Where ApprovalStatus = 0 AND RecordType = 1 And ValueFlag = 1 And StaffID = " + staffid;
                             + " Where ApprovalStatus = 0 AND RecordType = 1 And ValueFlag = 1 And StaffID = " + staffid;
                         oracleTrConn.ExecuteNonQuery(sqlString3);
                         oracleTrConn.ExecuteNonQuery(sqlString3);
-                    }
+                    //}
                     oracleTrConn.Commit();
                     oracleTrConn.Commit();
                     oracleTrConn.Disconnect();
                     oracleTrConn.Disconnect();
                     return resultEnity;
                     return resultEnity;