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

REBORN.Module.FinanceModule/FinancialModule.cs

@@ -3370,7 +3370,9 @@ namespace REBORN.Module.FinanceModule
                     model.DutyNo = clientModel.DutyNo ?? "暂无";
                     if (string.IsNullOrEmpty(model.DutyNo) && !(",7,8,9,10,").Contains("," + (int)model.ClientType + ","))
                     {
-                        model.DutyNo = Rb_SupplierRepository.GetEntity(clientModel.ObjID)?.DutyParagraph ?? "";
+                        var ssmodel = Rb_SupplierRepository.GetEntity(clientModel.ObjID);
+                        model.DutyNo = ssmodel?.DutyParagraph ?? "";
+                        model.SupplierName = ssmodel?.Name ?? "";
                     }
                     model.AccountTypeStr = (clientModel.Type == Common.Enum.Finance.ClientTypeEnum.Employee || clientModel.Type == Common.Enum.Finance.ClientTypeEnum.Leader || clientModel.Type == Common.Enum.Finance.ClientTypeEnum.Other) ? "1" : "0";
                     model.AccountCreateTime = StringHelper.FormatDateTimeStr(clientModel.CreateDate);

REBORN.Repository/Finance/RB_ClientBankAccountRepository.cs

@@ -147,10 +147,10 @@ namespace REBORN.Repository.Finance
                 parameters.Add("@keyWord", "%" + keyWord + "%");
             }
 
-            string sql = $@"select* from {TableName} c {where}";
+            string sql = $@"select c.* from {TableName} c {where}";
             if (model.Type > 0 && !(",7,8,9,10,").Contains("," + (int)model.Type + ","))
             {
-                sql = $@"select* from {TableName} c
+                sql = $@"select c.* from {TableName} c
 left join {(Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.rb_supplier s on c.ObjID =s.ID and c.Type=1
 left join {(Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.rb_supplier_type t on s.ID =t.SupplierId and t.Status=0
 {where} group by c.ID";

REBORN.Services.FinanceService/FinanceInfoService.cs

@@ -1018,8 +1018,9 @@ namespace REBORN.Services.FinanceService
                 list = list.Where(x => x.Value != "11" && x.Value != "12" && x.Value != "13" && x.Value != "14" && x.Value != "3").ToList();
                 int MaxId = list.Max(x => Convert.ToInt32(x.Value)) + 1;
                 var SortList = list.Where(x => x.Value == "15").ToList();
+                SortList.AddRange(list.Where(x => (",1,2,3,4,5,6,").Contains(x.Value)).OrderBy(x => Convert.ToInt32(x.Value)).ToList());
                 SortList.AddRange(list.Where(x => x.Value == "16").ToList());
-                SortList.AddRange(list.Where(x => x.Value != "15" && x.Value != "16").OrderBy(x => Convert.ToInt32(x.Value)).ToList());
+                SortList.AddRange(list.Where(x => (",9,10,").Contains(x.Value)).OrderBy(x => Convert.ToInt32(x.Value)).ToList());
                 list = SortList;
                 foreach (var item in list)
                 {