From 5e1a70bacbfa2cc7d71e9e199c2cd7145eb4d04e Mon Sep 17 00:00:00 2001
From: baozhoutao <baozhoutao@hotoa.com>
Date: Mon, 16 Oct 2023 16:51:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20[Bug]:=20=E7=B3=BB=E7=BB=9F=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E7=BC=BA=E5=B0=91=E4=BA=86=E7=94=A8=E6=88=B7=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=20#5571?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/default/objects/object_layouts.action.js         | 8 ++++----
 .../main/default/objects/objects.action.js                | 2 +-
 .../main/default/objects/users/fields/lockout.field.yml   | 1 +
 .../users/fields/login_failed_lockout_time.field.yml      | 1 +
 .../objects/users/fields/login_failed_number.field.yml    | 1 +
 .../main/default/objects/users/users.object.yml           | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/services/standard-object-database/main/default/objects/object_layouts.action.js b/services/standard-object-database/main/default/objects/object_layouts.action.js
index a472845af8..14fcc88f9f 100644
--- a/services/standard-object-database/main/default/objects/object_layouts.action.js
+++ b/services/standard-object-database/main/default/objects/object_layouts.action.js
@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-03-28 09:35:34
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-03-05 16:47:05
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-10-16 16:50:45
  * @Description: 
  */
 module.exports = {
@@ -22,8 +22,8 @@ module.exports = {
       FlowRouter.reload();
     }
   },
-  createDefaultRecordViewVisible: function(object_name, record_id, record_permissions){
-    if(!Creator.isSpaceAdmin()){
+  createDefaultRecordViewVisible: function(object_name, record_id, record_permissions, data){
+    if(!Creator.isSpaceAdmin() || data.record.name == 'users'){
         return false
     }
     return true;
diff --git a/services/standard-object-database/main/default/objects/objects.action.js b/services/standard-object-database/main/default/objects/objects.action.js
index 0931c7ce5b..08dcab677f 100644
--- a/services/standard-object-database/main/default/objects/objects.action.js
+++ b/services/standard-object-database/main/default/objects/objects.action.js
@@ -51,7 +51,7 @@ module.exports = {
         record = Creator.odata.get("objects", record_id, "is_deleted");
     }
     
-    if(record && !record.is_deleted){
+    if(record && !record.is_deleted && record.name != 'users'){
         return true;
     }
   },
diff --git a/services/standard-space/main/default/objects/users/fields/lockout.field.yml b/services/standard-space/main/default/objects/users/fields/lockout.field.yml
index 32d80ff1a9..397cf4795f 100644
--- a/services/standard-space/main/default/objects/users/fields/lockout.field.yml
+++ b/services/standard-space/main/default/objects/users/fields/lockout.field.yml
@@ -3,3 +3,4 @@ type: boolean
 omit: true
 hidden: true
 sort_no: 280
+label: Lockout
\ No newline at end of file
diff --git a/services/standard-space/main/default/objects/users/fields/login_failed_lockout_time.field.yml b/services/standard-space/main/default/objects/users/fields/login_failed_lockout_time.field.yml
index b510cc427b..cbf8633e2b 100644
--- a/services/standard-space/main/default/objects/users/fields/login_failed_lockout_time.field.yml
+++ b/services/standard-space/main/default/objects/users/fields/login_failed_lockout_time.field.yml
@@ -3,3 +3,4 @@ type: datetime
 omit: true
 hidden: true
 sort_no: 270
+label: Login Failed Lockout Time
diff --git a/services/standard-space/main/default/objects/users/fields/login_failed_number.field.yml b/services/standard-space/main/default/objects/users/fields/login_failed_number.field.yml
index c27f666bff..6161211352 100644
--- a/services/standard-space/main/default/objects/users/fields/login_failed_number.field.yml
+++ b/services/standard-space/main/default/objects/users/fields/login_failed_number.field.yml
@@ -3,3 +3,4 @@ type: number
 omit: true
 hidden: true
 sort_no: 260
+label: Login Failed Number
\ No newline at end of file
diff --git a/services/standard-space/main/default/objects/users/users.object.yml b/services/standard-space/main/default/objects/users/users.object.yml
index 2693f4b0e1..839ddd023e 100644
--- a/services/standard-space/main/default/objects/users/users.object.yml
+++ b/services/standard-space/main/default/objects/users/users.object.yml
@@ -2,4 +2,4 @@ name: users
 label: User
 icon: user
 enable_api: true
-hidden: true
+hidden: false