Merge branch 'hotfix/二次分配审核0隐藏' into develop

performance/Performance.Services/CustomExtractService.cs

@@ -134,6 +134,8 @@ private void WriteDataToFile(int userId, per_allot allot, List<cust_script> scri
             var parameters = GetParameters(allot);
             var (isSecondAdmin, department, unitType) = GetUserDepartment(userId);
             parameters.Add("@department", $"'{department}'");
+            if (unitType != null && unitType.Any())
+                parameters.Add("@unittype", $"{string.Join(", ", unitType.Select(t => $"'{t}'"))}");
 
             foreach (var item in scripts)
             {

performance/Performance.Services/SecondAllotService.cs

@@ -1551,7 +1551,7 @@ private List<ag_secondallot> SecondList(per_allot allot, List<res_account> accou
                 };
             });
             var enums = EnumHelper.GetItems<UnitType>();
-            return result.Where(w => w.RealGiveFee != 0)
+            return result.Where(w => w.RealGiveFee.HasValue && w.RealGiveFee != 0)
                 .OrderBy(t => t.Status == 4 ? 2 : t.Status)
                 .ThenBy(t => enums.FirstOrDefault(f => f.Name == t.UnitType)?.Value)
                 .ThenBy(t => t.Department)