Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

REBORN.Module.FinanceModule/FinanceWorkFlowModule.cs

@@ -909,28 +909,16 @@ namespace REBORN.Module.FinanceModule
                         var empList = GetPlatformCahierEmList(finance);
                         if (empList == null || !empList.Any())
                         {
-                            //未抓取到出纳  配置默认 张小芳
-                            #region 平台收款特殊处理  2024-05-09
-                            string PlatformAudit = Common.Config.GetAppSetting("PlatformAudit");
-                            if (finance.RB_Group_Id == 2 && finance.Is_Platform == 1)
+                            //使用工作台配置
+                            var winModel = windowModule.GetPageList(1, 1, new RB_Window_Extend() { RB_Group_Id = userInfo.RB_Group_id, Type = Common.Enum.Finance.WindowTypeEnum.Cashier }, out _).FirstOrDefault();
+                            if (winModel != null)
                             {
-                                //谢哥ID =40  
-                                PlatformAudit += ",40";
-                                //新人 潘娇 负责平台收款
-                                PlatformAudit += ",3390";
+                                if (winModel.emList != null && winModel.emList.Any())
+                                {
+                                    empList = employeeRepository.GetEmpInfoByIds(string.Join(",", winModel.emList.Select(x => x.EmId)));
                                 }
-                            #endregion
-                            empList = employeeRepository.GetEmpInfoByIds(PlatformAudit);
                             }
-                        #region 特殊处理 如果包含小芳审核，增加 谢哥 或签
-                        if (finance.RB_Group_Id == 2 && empList.Any(x => x.EmployeeId == 1934) && !empList.Any(x => x.EmployeeId == 40)) {
-                            empList.Add(new RB_Employee_Extend() { EmployeeId = 40, EmLoginMobile = "13402867700" });
                         }
-                        if (finance.RB_Group_Id == 2 && empList.Any(x => x.EmployeeId == 1934) && !empList.Any(x => x.EmployeeId == 3523))
-                        {
-                            empList.Add(new RB_Employee_Extend() { EmployeeId = 3523, EmLoginMobile = "13281112980" });
-                        }
-                        #endregion
                         if (empList != null && empList.Count() > 0)
                         {
                             newList = empList.Select(x => x.EmployeeId).ToList();

REBORN.Module.FinanceModule/FinanceWorkFlowModule_p2.cs

@@ -2411,27 +2411,16 @@ namespace REBORN.Module.FinanceModule
                             var empList = GetPlatformCahierEmList(finaneModel);
                             if (empList == null || !empList.Any())
                             {
-                                //未抓取到出纳  配置默认 张小芳
-                                #region 平台收款特殊处理  2024-05-09
-                                string PlatformAudit = Config.GetAppSetting("PlatformAudit");
-                                if (finaneModel.RB_Group_Id == 2 && finaneModel.Is_Platform == 1)
+                                //使用工作台配置
+                                var winModel = windowModule.GetPageList(1, 1, new RB_Window_Extend() { RB_Group_Id = userInfo.RB_Group_id, Type = Common.Enum.Finance.WindowTypeEnum.Cashier }, out _).FirstOrDefault();
+                                if (winModel != null)
                                 {
-                                    //谢哥ID =40  
-                                    PlatformAudit += ",40";
-                                }
-                                #endregion
-                                empList = employeeRepository.GetEmpInfoByIds(PlatformAudit);
-                            }
-                            #region 特殊处理 如果包含小芳审核，增加 谢哥 或签
-                            if (finaneModel.RB_Group_Id == 2 && empList.Any(x => x.EmployeeId == 1934) && !empList.Any(x => x.EmployeeId == 40))
+                                    if (winModel.emList != null && winModel.emList.Any())
                                     {
-                                empList.Add(new RB_Employee_Extend() { EmployeeId = 40, EmLoginMobile = "13402867700" });
+                                        empList = employeeRepository.GetEmpInfoByIds(string.Join(",", winModel.emList.Select(x => x.EmId)));
+                                    }
                                 }
-                            if (finaneModel.RB_Group_Id == 2 && empList.Any(x => x.EmployeeId == 1934) && !empList.Any(x => x.EmployeeId == 3523))
-                            {
-                                empList.Add(new RB_Employee_Extend() { EmployeeId = 3523, EmLoginMobile = "13281112980" });
                             }
-                            #endregion
                             if (empList != null && empList.Count() > 0)
                             {
                                 sendAccount = empList?.Select(t => new Model.Extend.Finance.EmAccoutIdModel() { EmAccount = t.EmLoginMobile, EmployeeId = t.EmployeeId }).ToList();