审批流程调整

Property.Modele.FixedAssets/WorkFlowModule.cs

@@ -301,7 +301,10 @@ namespace Property.Module.FixedAssets
                         empList = audituserList?.Select(x => x.EmployeeId ?? 0).ToList();
                         if (empList != null && empList.Count > 0)
                         {
-                            newList = empList;
+                            #region 判断下一步是否有转交人
+                            newList = new List<int>();
+                            newList = GetNewEmList(empList);
+                            #endregion
                             var emp2List = employeeRepository.GetEmpInfoByIds(string.Join(",", newList?.Select(x => x).ToList()));
                             sendAccount = emp2List.Select(t => new EmAccoutIdModel() { EmAccount = t.EmLoginMobile, EmployeeId = t.EmployeeId }).ToList();//推送
                         }
@@ -1618,6 +1621,8 @@ namespace Property.Module.FixedAssets
                             {
 
                             }
+                            if (usemodel.Source != PropertySourceEnum.Maintain)
+                            {
                                 List<WhereHelper> pwheres = new List<WhereHelper>() {
                                     new WhereHelper(){
                                      FiledName=nameof(RB_Property_Info.Id),
@@ -1625,6 +1630,7 @@ namespace Property.Module.FixedAssets
                                     }
                                 };
                                 property_InfoRepository.Update(pflies, pwheres, trans);
+                            }
                             //日志
                             var emmodel = CacheManager.User.UserReidsCache.GetEmployee(usemodel.EmployeeId);
                             string ContentMsg = "";