|
@@ -9,6 +9,7 @@ use Hyperf\HttpServer\Annotation\AutoController;
|
|
|
use App\Tools\Result;
|
|
|
use Hyperf\Validation\Contract\ValidatorFactoryInterface;
|
|
|
use Hyperf\Context\Context;
|
|
|
+use App\JsonRpc\UserServiceInterface;
|
|
|
/**
|
|
|
* Class NewsController
|
|
|
* @package App\Controller
|
|
@@ -25,6 +26,13 @@ class NewsController extends AbstractController
|
|
|
#[Inject]
|
|
|
private $newsServiceClient;
|
|
|
|
|
|
+ /**
|
|
|
+ * @var UserServiceInterface
|
|
|
+ */
|
|
|
+ #[Inject]
|
|
|
+ private $userServiceClient;
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 导航池列表
|
|
|
* @return void
|
|
@@ -47,8 +55,12 @@ class NewsController extends AbstractController
|
|
|
$errorMessage = $validator->errors()->first();
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ //获取用户信息
|
|
|
+ $user_id = Context::get("UserId");
|
|
|
+ $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
|
|
|
+ var_dump("用户信息:",$userInfo);
|
|
|
+ $sszq = $userInfo['data']['sszq'];
|
|
|
+ $type_id = $userInfo['data']['type_id']; //'1:个人会员 2:政务会员 3:企业会员 4:调研员 10000:管理员 20000:游客(小程序)'
|
|
|
$result = $this->newsServiceClient->getCategoryList($requireData);
|
|
|
if($result['data']){
|
|
|
foreach ($result['data']['rows'] as $k=>$v) {
|
|
@@ -80,8 +92,19 @@ class NewsController extends AbstractController
|
|
|
}
|
|
|
|
|
|
$requireData['website_id'] = Context::get("SiteId");
|
|
|
-
|
|
|
- $result = $this->newsServiceClient->categoryList($requireData);
|
|
|
+ //获取用户信息
|
|
|
+ $user_id = Context::get("UserId");
|
|
|
+ $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
|
|
|
+ var_dump("用户信息:",$userInfo);
|
|
|
+ $sszq = $userInfo['data']['sszq'];
|
|
|
+ $type_id = $userInfo['data']['type_id']; //'1:个人会员 2:政务会员 3:企业会员 4:调研员 10000:管理员 20000:游客(小程序)'
|
|
|
+ //管理员看所有
|
|
|
+ if($type_id == 10000){
|
|
|
+ $result = $this->newsServiceClient->categoryList($requireData);
|
|
|
+ } else {
|
|
|
+ $requireData['sszq'] = $sszq;
|
|
|
+ $result = $this->newsServiceClient->myCategoryList($requireData);
|
|
|
+ }
|
|
|
// $rep = PublicData::buildMenuTree($result['data']);
|
|
|
return $result ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
@@ -218,6 +241,16 @@ class NewsController extends AbstractController
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
$requireData['website_id'] = Context::get("SiteId");
|
|
|
+ //获取用户信息
|
|
|
+ $user_id = Context::get("UserId");
|
|
|
+ $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
|
|
|
+ var_dump("用户信息:",$userInfo);
|
|
|
+ $sszq = $userInfo['data']['sszq'];
|
|
|
+ $type_id = $userInfo['data']['type_id']; //'1:个人会员 2:政务会员 3:企业会员 4:调研员 10000:管理员 20000:游客(小程序)'
|
|
|
+ $requireData['type_id'] = $type_id;
|
|
|
+ $requireData['user_id'] = $user_id;
|
|
|
+
|
|
|
+
|
|
|
var_dump("资讯:",$requireData);
|
|
|
$result = $this->newsServiceClient->getArticleList($requireData);
|
|
|
//1通过,2待审核,3待发 4,拒绝 5删除
|