mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-05-23 11:26:24 +08:00
parent cde1587bec
commit 0db4bfe7da
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/adminapi/lists/works/rlzy/OaPersonalQuitLists.php
View File

@ -16,7 +16,7 @@ namespace app\adminapi\lists\works\rlzy;
use app\adminapi\lists\BaseAdminDataLists; 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\model\works\rlzy\OaPersonalQuit;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
@ -59,9 +59,9 @@ class OaPersonalQuitLists extends BaseAdminDataLists implements ListsSearchInter
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($data){ ->select()->each(function($data){
$user = OaAdmin::where('id',$data['uid'])->findOrEmpty(); $user = Admin::where('id',$data['uid'])->findOrEmpty();
$other_user = OaAdmin::where('id','in',[$data['lead_admin_id'],$data['connect_id']])->column('name','id'); $other_user = Admin::where('id','in',[$data['lead_admin_id'],$data['connect_id']])->column('name','id');
$connect_users = OaAdmin::where('id','in',$data['connect_uids'])->column('name'); $connect_users = Admin::where('id','in',$data['connect_uids'])->column('name');
$data['user_name'] = $user['name']; $data['user_name'] = $user['name'];
$data['lead_admin_name'] = $other_user[$data['lead_admin_id']] ?? ''; $data['lead_admin_name'] = $other_user[$data['lead_admin_id']] ?? '';
$data['connect_user_name'] = $other_user[$data['connect_id']] ?? ''; $data['connect_user_name'] = $other_user[$data['connect_id']] ?? '';

10
app/adminapi/logic/works/rlzy/OaPersonalQuitLogic.php
View File

@ -15,7 +15,7 @@
namespace app\adminapi\logic\works\rlzy; 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\model\works\rlzy\OaPersonalQuit;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use think\facade\Db; use think\facade\Db;
@ -51,7 +51,7 @@ class OaPersonalQuitLogic extends BaseLogic
'connect_time' => !empty($params['connect_time']) ? strtotime($params['connect_time']) : 0, 'connect_time' => !empty($params['connect_time']) ? strtotime($params['connect_time']) : 0,
'quit_time' => !empty($params['quit_time']) ? strtotime($params['quit_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(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -117,9 +117,9 @@ class OaPersonalQuitLogic extends BaseLogic
public static function detail($params): array public static function detail($params): array
{ {
$data = OaPersonalQuit::findOrEmpty($params['id']); $data = OaPersonalQuit::findOrEmpty($params['id']);
$user = OaAdmin::where('id',$data['uid'])->findOrEmpty(); $user = Admin::where('id',$data['uid'])->findOrEmpty();
$other_user = OaAdmin::where('id','in',[$data['lead_admin_id'],$data['connect_id']])->column('name','id'); $other_user = Admin::where('id','in',[$data['lead_admin_id'],$data['connect_id']])->column('name','id');
$connect_users = OaAdmin::where('id','in',$data['connect_uids'])->column('name'); $connect_users = Admin::where('id','in',$data['connect_uids'])->column('name');
$data['user_name'] = $user['name']; $data['user_name'] = $user['name'];
$data['lead_admin_name'] = $other_user[$data['lead_admin_id']] ?? ''; $data['lead_admin_name'] = $other_user[$data['lead_admin_id']] ?? '';
$data['connect_user_name'] = $other_user[$data['connect_id']] ?? ''; $data['connect_user_name'] = $other_user[$data['connect_id']] ?? '';

3
app/common/model/works/rlzy/OaDepartmentChange.php
View File

@ -15,6 +15,7 @@
namespace app\common\model\works\rlzy; namespace app\common\model\works\rlzy;
use app\common\model\auth\Admin;
use app\common\model\BaseModel; use app\common\model\BaseModel;
use app\common\model\dept\Dept; use app\common\model\dept\Dept;
use think\model\concern\SoftDelete; use think\model\concern\SoftDelete;
@ -43,7 +44,7 @@ class OaDepartmentChange extends BaseModel
} }
public function getUserNameAttr($value,$data){ 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'] : ''; return !$user->isEmpty() ? $user['name'] : '';
} }