diff --git a/app/adminapi/lists/works/rlzy/OaPersonalQuitLists.php b/app/adminapi/lists/works/rlzy/OaPersonalQuitLists.php index 1f170c3f6..5c2222d78 100644 --- a/app/adminapi/lists/works/rlzy/OaPersonalQuitLists.php +++ b/app/adminapi/lists/works/rlzy/OaPersonalQuitLists.php @@ -16,7 +16,7 @@ namespace app\adminapi\lists\works\rlzy; use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\works\rlzy\OaAdmin; +use app\common\model\auth\Admin; use app\common\model\works\rlzy\OaPersonalQuit; use app\common\lists\ListsSearchInterface; @@ -59,9 +59,9 @@ class OaPersonalQuitLists extends BaseAdminDataLists implements ListsSearchInter ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($data){ - $user = OaAdmin::where('id',$data['uid'])->findOrEmpty(); - $other_user = OaAdmin::where('id','in',[$data['lead_admin_id'],$data['connect_id']])->column('name','id'); - $connect_users = OaAdmin::where('id','in',$data['connect_uids'])->column('name'); + $user = Admin::where('id',$data['uid'])->findOrEmpty(); + $other_user = Admin::where('id','in',[$data['lead_admin_id'],$data['connect_id']])->column('name','id'); + $connect_users = Admin::where('id','in',$data['connect_uids'])->column('name'); $data['user_name'] = $user['name']; $data['lead_admin_name'] = $other_user[$data['lead_admin_id']] ?? ''; $data['connect_user_name'] = $other_user[$data['connect_id']] ?? ''; diff --git a/app/adminapi/logic/works/rlzy/OaPersonalQuitLogic.php b/app/adminapi/logic/works/rlzy/OaPersonalQuitLogic.php index b763239ae..67cbd97e7 100644 --- a/app/adminapi/logic/works/rlzy/OaPersonalQuitLogic.php +++ b/app/adminapi/logic/works/rlzy/OaPersonalQuitLogic.php @@ -15,7 +15,7 @@ namespace app\adminapi\logic\works\rlzy; -use app\common\model\works\rlzy\OaAdmin; +use app\common\model\auth\Admin; use app\common\model\works\rlzy\OaPersonalQuit; use app\common\logic\BaseLogic; use think\facade\Db; @@ -51,7 +51,7 @@ class OaPersonalQuitLogic extends BaseLogic 'connect_time' => !empty($params['connect_time']) ? strtotime($params['connect_time']) : 0, 'quit_time' => !empty($params['quit_time']) ? strtotime($params['quit_time']) : 0, ]); - OaAdmin::where('id',$params['uid'])->update(['status'=>2]); + Admin::where('id',$params['uid'])->update(['status'=>2]); Db::commit(); return true; } catch (\Exception $e) { @@ -117,9 +117,9 @@ class OaPersonalQuitLogic extends BaseLogic public static function detail($params): array { $data = OaPersonalQuit::findOrEmpty($params['id']); - $user = OaAdmin::where('id',$data['uid'])->findOrEmpty(); - $other_user = OaAdmin::where('id','in',[$data['lead_admin_id'],$data['connect_id']])->column('name','id'); - $connect_users = OaAdmin::where('id','in',$data['connect_uids'])->column('name'); + $user = Admin::where('id',$data['uid'])->findOrEmpty(); + $other_user = Admin::where('id','in',[$data['lead_admin_id'],$data['connect_id']])->column('name','id'); + $connect_users = Admin::where('id','in',$data['connect_uids'])->column('name'); $data['user_name'] = $user['name']; $data['lead_admin_name'] = $other_user[$data['lead_admin_id']] ?? ''; $data['connect_user_name'] = $other_user[$data['connect_id']] ?? ''; diff --git a/app/common/model/works/rlzy/OaDepartmentChange.php b/app/common/model/works/rlzy/OaDepartmentChange.php index d9382cee4..0b8018c62 100644 --- a/app/common/model/works/rlzy/OaDepartmentChange.php +++ b/app/common/model/works/rlzy/OaDepartmentChange.php @@ -15,6 +15,7 @@ namespace app\common\model\works\rlzy; +use app\common\model\auth\Admin; use app\common\model\BaseModel; use app\common\model\dept\Dept; use think\model\concern\SoftDelete; @@ -43,7 +44,7 @@ class OaDepartmentChange extends BaseModel } public function getUserNameAttr($value,$data){ - $user = OaAdmin::field('name')->where('id',$data['uid'])->findOrEmpty(); + $user = Admin::field('name')->where('id',$data['uid'])->findOrEmpty(); return !$user->isEmpty() ? $user['name'] : ''; }