修改用户批量表头顺序

performance/Performance.Api/Controllers/AccountController.cs

@@ -396,6 +396,9 @@ public ApiResponse BatchSaveUser([FromBody] UserCollectData data)
             var result = _userService.SaveUserHandsFlat(data);
             switch (result)
             {
+                case 0:
+                    //hack:后续根据accounting更改提示信息
+                    return new ApiResponse(ResponseType.Error, "科室字典为空");
                 case 1:
                     return new ApiResponse(ResponseType.OK);
                 case 2:

performance/Performance.Services/UserService.cs

@@ -732,7 +732,9 @@ public int SaveUserHandsFlat(UserCollectData request)
                 var getUsers = _userRepository.GetEntities();
                 var roles = _roleRepository.GetEntities();
                 var hospitals = _hospitalRepository.GetEntities();
-                var depts = _perdeptdicRepository.GetEntities(t => t.HospitalId == request.HospitalId).Select(w=>w.Department).Distinct();
+                //hack:后续修改为accounting中的数据
+                var depts = _perdeptdicRepository.GetEntities(t => t.HospitalId == request.HospitalId)?.Select(w => w.Department).Distinct();
+
                 List<sys_user> users = new List<sys_user>();
                 List<sys_user_role> userRoles = new List<sys_user_role>();
                 List<sys_user_hospital> userHoss = new List<sys_user_hospital>();
@@ -742,7 +744,8 @@ public int SaveUserHandsFlat(UserCollectData request)
                     var json = JsonHelper.Serialize(item);
                     var data = JsonHelper.Deserialize<UserHandsResponse>(json);
 
-                    if (users.Any(c => c.Login == data.Login) || getUsers.Any(c => c.Login == data?.Login)) return 2;
+                    if(roleArr.Contains(data.RoleName) && (depts==null || !depts.Any())) return 0;
+                    if (users.Any(c => c.Login == data?.Login) || getUsers.Any(c => c.Login == data?.Login)) return 2;
                     if (roleArr.Contains(data.RoleName) && !depts.Any(t => t == data.Department)) return 3;
 
                     if (!string.IsNullOrEmpty(data.Login) && !string.IsNullOrEmpty(data.RealName) && !string.IsNullOrEmpty(data.HosName))
@@ -796,8 +799,8 @@ public int SaveUserHandsFlat(UserCollectData request)
             {nameof(sys_user.Mobile), "手机号码"},
             {nameof(sys_user.Mail), "邮箱"},
             {nameof(sys_role.RoleName), "角色"},
-            {nameof(sys_user.Department), "核算单元"},
             {nameof(sys_hospital.HosName), "分配医院"},
+            {nameof(sys_user.Department), "核算单元"},
         };
 
         private List<Dictionary<string, string>> CreateDataRow(UserCollectData request, Dictionary<string, string> config)