From e8f45a710aa557833306e30943b470cd459adbce Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 9 Dec 2023 18:19:36 +0800 Subject: [PATCH] update --- app/adminapi/logic/dept/DeptLogic.php | 1 + app/adminapi/logic/dept/JobsLogic.php | 1 + app/adminapi/logic/dept/OrgsLogic.php | 4 +++- app/common/model/dept/Dept.php | 6 +++--- app/common/model/dept/Jobs.php | 6 +++--- app/common/model/dept/Orgs.php | 6 +++--- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/adminapi/logic/dept/DeptLogic.php b/app/adminapi/logic/dept/DeptLogic.php index 589694d19..90dbafee4 100755 --- a/app/adminapi/logic/dept/DeptLogic.php +++ b/app/adminapi/logic/dept/DeptLogic.php @@ -107,6 +107,7 @@ class DeptLogic extends BaseLogic } $org = Orgs::where('id',$dept['org_id'])->findOrEmpty(); $dept['org_name'] = $org->isEmpty() ? '' : $org['name']; + $dept['status_text'] = $dept->status_text; return $dept->toArray(); } diff --git a/app/adminapi/logic/dept/JobsLogic.php b/app/adminapi/logic/dept/JobsLogic.php index b1aa31833..ed368ca60 100755 --- a/app/adminapi/logic/dept/JobsLogic.php +++ b/app/adminapi/logic/dept/JobsLogic.php @@ -100,6 +100,7 @@ class JobsLogic extends BaseLogic } $dept = Dept::where('id',$jobs['dept_id'])->findOrEmpty(); $jobs['dept_name'] = $dept->isEmpty() ? '' : $dept['name']; + $jobs['status_text'] = $jobs->status_text; return $jobs->toArray(); } diff --git a/app/adminapi/logic/dept/OrgsLogic.php b/app/adminapi/logic/dept/OrgsLogic.php index cdaf19933..76d67c277 100644 --- a/app/adminapi/logic/dept/OrgsLogic.php +++ b/app/adminapi/logic/dept/OrgsLogic.php @@ -112,6 +112,8 @@ class OrgsLogic extends BaseLogic */ public static function detail($params): array { - return Orgs::field('id,name,master,status,create_time')->findOrEmpty($params['id'])->toArray(); + $res = Orgs::field('id,name,master,status,create_time')->findOrEmpty($params['id']); + $res['status_text'] = $res->status_text; + return $res->toArray(); } } \ No newline at end of file diff --git a/app/common/model/dept/Dept.php b/app/common/model/dept/Dept.php index 52803ad1e..6f4a53cd7 100755 --- a/app/common/model/dept/Dept.php +++ b/app/common/model/dept/Dept.php @@ -30,10 +30,10 @@ class Dept extends BaseModel protected $deleteTime = 'delete_time'; - public function getStatusAttr($value): string + public function getStatusTextAttr($value,$data): string { - $status = [1=>'禁用',0=>'正常']; - return $status[$value]; + $status = [0=>'正常',1=>'停用']; + return $status[$data['status']]; } } \ No newline at end of file diff --git a/app/common/model/dept/Jobs.php b/app/common/model/dept/Jobs.php index d4ab8204b..04ca45e8d 100755 --- a/app/common/model/dept/Jobs.php +++ b/app/common/model/dept/Jobs.php @@ -29,9 +29,9 @@ class Jobs extends BaseModel protected $deleteTime = 'delete_time'; - public function getStatusAttr($value): string + public function getStatusTextAttr($value,$data): string { - $status = [1=>'禁用',0=>'正常']; - return $status[$value]; + $status = [0=>'正常',1=>'停用']; + return $status[$data['status']]; } } \ No newline at end of file diff --git a/app/common/model/dept/Orgs.php b/app/common/model/dept/Orgs.php index 84d709176..518230661 100644 --- a/app/common/model/dept/Orgs.php +++ b/app/common/model/dept/Orgs.php @@ -30,10 +30,10 @@ class Orgs extends BaseModel protected $name = 'orgs'; protected $deleteTime = 'delete_time'; - public function getStatusAttr($value): string + public function getStatusTextAttr($value,$data): string { - $status = [1=>'禁用',0=>'正常']; - return $status[$value]; + $status = [0=>'正常',1=>'停用']; + return $status[$data['status']]; } } \ No newline at end of file