|
@@ -5,6 +5,7 @@ use App\Model\Menu;
|
|
use App\Model\RoleUser;
|
|
use App\Model\RoleUser;
|
|
use App\Model\Website;
|
|
use App\Model\Website;
|
|
use App\Model\WebsiteRoleUser;
|
|
use App\Model\WebsiteRoleUser;
|
|
|
|
+use App\Tools\PublicData;
|
|
use App\Tools\Result;
|
|
use App\Tools\Result;
|
|
use Hyperf\RpcServer\Annotation\RpcService;
|
|
use Hyperf\RpcServer\Annotation\RpcService;
|
|
|
|
|
|
@@ -39,6 +40,9 @@ class AuthorityService implements AuthorityServiceInterface
|
|
if (empty($result)) {
|
|
if (empty($result)) {
|
|
return Result::error("没有菜单",0,[]);
|
|
return Result::error("没有菜单",0,[]);
|
|
}
|
|
}
|
|
|
|
+ $result = $result->toArray();
|
|
|
|
+ $result['icon'] = isset($result['icon']) && $result['icon']?PublicData::getImageUrl($result['icon']):'';
|
|
|
|
+ $result['selected_icon'] = isset($result['selected_icon']) && $result['selected_icon']?PublicData::getImageUrl($result['selected_icon']):'';
|
|
return Result::success($result);
|
|
return Result::success($result);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -52,6 +56,8 @@ class AuthorityService implements AuthorityServiceInterface
|
|
'id'=>$data['id']
|
|
'id'=>$data['id']
|
|
];
|
|
];
|
|
unset($data['id']);
|
|
unset($data['id']);
|
|
|
|
+ $data['icon'] = isset($data['icon']) && $data['icon']?PublicData::saveImageUrl($data['icon']):'';
|
|
|
|
+ $data['selected_icon'] = isset($data['selected_icon']) && $data['selected_icon']?PublicData::saveImageUrl($data['selected_icon']):'';
|
|
$result = Menu::where($where)->update($data);
|
|
$result = Menu::where($where)->update($data);
|
|
if($result){
|
|
if($result){
|
|
return Result::success($data);
|
|
return Result::success($data);
|
|
@@ -80,6 +86,8 @@ class AuthorityService implements AuthorityServiceInterface
|
|
*/
|
|
*/
|
|
public function addMenu(array $data): array
|
|
public function addMenu(array $data): array
|
|
{
|
|
{
|
|
|
|
+ $data['icon'] = isset($data['icon']) && $data['icon']?PublicData::saveImageUrl($data['icon']):'';
|
|
|
|
+ $data['selected_icon'] = isset($data['selected_icon']) && $data['selected_icon']?PublicData::saveImageUrl($data['selected_icon']):'';
|
|
$result = Menu::insertGetId($data);
|
|
$result = Menu::insertGetId($data);
|
|
if($result){
|
|
if($result){
|
|
return Result::success($data);
|
|
return Result::success($data);
|