diff --git a/SGGL/BLL/API/APIUpLoadFileService.cs b/SGGL/BLL/API/APIUpLoadFileService.cs
index bf1e5691..2a7abe24 100644
--- a/SGGL/BLL/API/APIUpLoadFileService.cs
+++ b/SGGL/BLL/API/APIUpLoadFileService.cs
@@ -111,6 +111,7 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
+                CommonService.DeleteAttachFileById(toDoItem.DataId);
                 ////保存附件
                 if (!string.IsNullOrEmpty(toDoItem.UrlStr))
                 {
diff --git a/SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs b/SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs
index 2e6738e5..34ce2b01 100644
--- a/SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs
+++ b/SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs
@@ -236,7 +236,7 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                Model.Meeting_CQMSMeetingApprove newApprove = db.Meeting_CQMSMeetingApprove.FirstOrDefault(e => e.MeetingApproveId == approve.MeetingApproveId && e.ApproveDate == null);
+                Model.Meeting_CQMSMeetingApprove newApprove = db.Meeting_CQMSMeetingApprove.FirstOrDefault(e => e.MeetingId == approve.MeetingId && e.ApproveDate == null);
                 if (newApprove != null)
                 {
                     if (!string.IsNullOrEmpty(approve.ApproveMan))
diff --git a/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs b/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs
index 083cb5d5..b0e9ddb4 100644
--- a/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs
+++ b/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs
@@ -126,7 +126,7 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                Model.RewardAndPunish_RewardAndPunishApprove newApprove = db.RewardAndPunish_RewardAndPunishApprove.FirstOrDefault(e => e.RewardAndPunishApproveId == approve.RewardAndPunishApproveId && e.ApproveDate == null);
+                Model.RewardAndPunish_RewardAndPunishApprove newApprove = db.RewardAndPunish_RewardAndPunishApprove.FirstOrDefault(e => e.RewardAndPunishId == approve.RewardAndPunishId && e.ApproveDate == null);
                 if (newApprove != null)
                 {
                     if (!string.IsNullOrEmpty(approve.ApproveMan))
diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs
index 9b42a026..7b437e32 100644
--- a/SGGL/BLL/Person/Person_PersonsService.cs
+++ b/SGGL/BLL/Person/Person_PersonsService.cs
@@ -666,7 +666,7 @@ namespace BLL
                     JobNum = person.JobNum,
                     PersonName = person.PersonName,
                     Account = person.Account,
-                    Password = GetPersonPassWord(person.IdentityCard),
+                    Password = GetPersonPassWord(person.IdentityCard, person.Account),
                     IsOffice = person.IsOffice,
                     RoleIds = person.RoleIds,
                     IdentityCard = person.IdentityCard,
@@ -1102,19 +1102,22 @@ namespace BLL
         /// </summary>
         /// <param name="idCard"></param>
         /// <returns></returns>
-        public static string GetPersonPassWord(string idCard)
+        public static string GetPersonPassWord(string idCard,string Account)
         {
             string passWord = Funs.EncryptionPassword(Const.Password);
-            ////现场人员密码
-            if (!string.IsNullOrEmpty(idCard))
+            if (string.IsNullOrEmpty(Account))
             {
-                if (idCard.Length > 3)
+                ////现场人员密码
+                if (!string.IsNullOrEmpty(idCard))
                 {
-                    passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4));
-                }
-                else
-                {
-                    passWord = Funs.EncryptionPassword(idCard);
+                    if (idCard.Length > 3)
+                    {
+                        passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4));
+                    }
+                    else
+                    {
+                        passWord = Funs.EncryptionPassword(idCard);
+                    }
                 }
             }
             return passWord;
diff --git a/SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs b/SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs
index 2b846a71..2974cc55 100644
--- a/SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs
+++ b/SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs
@@ -472,6 +472,12 @@ namespace Mvc.Controllers
                         res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "Meeting_CQMSMeeting", "MeetingCode", projectId, prefix);
                     }
                     break;
+                case "rewardAndPunish":
+                    {
+                        string prefix = BLL.ProjectService.GetProjectCodeByProjectId(projectId) + "-" + BLL.UnitService.GetUnitCodeByUnitId(unitId) + "-ZLJC-";
+                        res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "RewardAndPunish_RewardAndPunish", "RewardAndPunishCode", projectId, prefix);
+                    }
+                    break;
             }
             return res;
         }