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

Merge pull request 'update' (#200) from zhangwei into dev

Browse Source 
Reviewed-on: #200
This commit is contained in:
weiz 2024-01-20 11:01:41 +08:00
commit 5cebf1f09b
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/adminapi/logic/custom/CustomLogic.php
View File

@ -50,7 +50,6 @@ class CustomLogic extends BaseLogic
'dept_id' => $params['dept_id'],
'name' => $params['name'],
'custom_type' => $params['custom_type'],
'parent_company' => $params['parent_company'] ?? '',
'phone' => $params['phone'],
'credit_rating' => $params['credit_rating'],
'province' => $params['province'] ?? 0,
@ -112,7 +111,6 @@ class CustomLogic extends BaseLogic
'dept_id' => $params['dept_id'],
'name' => $params['name'],
'custom_type' => $params['custom_type'],
'parent_company' => $params['parent_company'] ?? '',
'phone' => $params['phone'],
'credit_rating' => $params['credit_rating'],
'province' => $params['province'] ?? 0,
@ -153,7 +151,18 @@ class CustomLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
return Custom::destroy($params['id']);
Db::startTrans();
try {
$custom_contacts_ids = CustomContacts::where('custom_id',$params['id'])->column('id');
Custom::destroy($params['id']);
CustomContacts::destroy($custom_contacts_ids);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}

4
app/adminapi/validate/custom/CustomValidate.php
View File

@ -82,7 +82,9 @@ class CustomValidate extends BaseValidate
* @date 2023/11/11 22:10
*/
public function sceneEdit()
{}
{
return $this->remove('other_contacts',true);
}
/**

8
app/common/model/custom/Custom.php
View File

@ -61,12 +61,12 @@ class Custom extends BaseModel
}
public function getCustomTypeTextAttr($value,$data){
$dictData = DictData::where('type_value','custom_type')->column('name','value');
return $dictData[$data['custom_type']];
$dict = DictData::where('type_value','custom_type')->column('name','value');
return !empty($data['custom_type']) ? $dict[$data['custom_type']] : '';
}
public function getCreditRatingTextAttr($value,$data){
$dictData = DictData::where('type_value','credit_rating')->column('name','value');
return $dictData[$data['credit_rating']];
$dict = DictData::where('type_value','credit_rating')->column('name','value');
return !empty($data['credit_rating']) ? $dict[$data['credit_rating']] : '';
}
}