2 Commits f8b47df901 ... 12e188ca29

Author SHA1 Message Date
  LiuJ 12e188ca29 Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer 2 days ago
  LiuJ 4464203b46 投诉 2 days ago

+ 39 - 12
app/Controller/NewsController.php

@@ -1033,6 +1033,29 @@ class NewsController extends AbstractController
         $result = $this->newsServiceClient->updateComplaint($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    public function getDUser()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                // 'page' => 'integer|required',
+                // 'page_size' => 'integer|required',
+                // 'checkout' => 'integer|required',
+            ],
+            [
+                // 'page.integer' => 'page必须是整型',
+                // 'page_size.integer' => 'page_size必须是整型',
+                // 'page.required' => 'page不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->newsServiceClient->getDUser($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
     //20250324  通知,公告,消息
 
     //   20250306    招聘
@@ -1046,8 +1069,8 @@ class NewsController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'page'=> 'integer|required',
-                'page_size'=> 'integer|required',
+                'page' => 'integer|required',
+                'page_size' => 'integer|required',
                 'checkout' => 'integer|required',
             ],
             [
@@ -1057,7 +1080,7 @@ class NewsController extends AbstractController
                 'page_size.required' => 'page_size不能为空',
                 'checkout.required' => 'checkout不能为空',
                 'checkout.integer' => 'checkout必须是整型',
-            ]   
+            ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
@@ -1496,38 +1519,40 @@ class NewsController extends AbstractController
     {
         $requireData = $this->request->all();
         $result = $this->newsServiceClient->getCompanyNature($requireData);
-        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);   
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /*
     *后端-招聘 职位审核
     * @return array
     */
-    public function checkJobRecruiting(){
+    public function checkJobRecruiting()
+    {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id'=>'required',
+                'id' => 'required',
                 'status' => 'required|integer|in:0,1,2',
-            ], 
+            ],
             [
                 'id.required' => 'id不能为空',
                 'status.required' => 'status不能为空',
                 'status.integer' => 'status必须是整数',
-                'status.in' => 'status必须是1,2,3中的一个' 
-            ]);
+                'status.in' => 'status必须是1,2,3中的一个'
+            ]
+        );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if($requireData['status']=='2'){
-            if(empty($requireData['refuse_reason'])){
+        if ($requireData['status'] == '2') {
+            if (empty($requireData['refuse_reason'])) {
                 return Result::error('请填写审核不通过原因');
             }
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->newsServiceClient->checkJobRecruiting($requireData);
-        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     //202504084  审核状态
     public function updateGoodStatus()
@@ -1548,6 +1573,8 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        $requireData['user_id'] = Context::get("UserId");
+        $requireData['type_id'] = Context::get("TypeId");
         $result = $this->newsServiceClient->updateGoodStatus($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }

+ 139 - 140
app/Controller/UserController.php

@@ -11,6 +11,7 @@ use App\Tools\Result;
 use App\Constants\ErrorCode;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Context\Context;
+
 /**
  * Class UserController
  * @package App\Controller
@@ -32,32 +33,32 @@ class UserController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'user_name' => 'required',//登陆账号
-                'type_id'=> 'required',//用户类型
-                'password' => 'required|min:6',//密码
+                'user_name' => 'required', //登陆账号
+                'type_id' => 'required', //用户类型
+                'password' => 'required|min:6', //密码
                 'confirm_password' => 'required',
                 'real_name' => 'required',
                 'role_id' => 'required',
-//                'mobile' =>'required'
+                //                'mobile' =>'required'
             ],
             [
                 'user_name.required' => '用户名不能为空',
                 'password.required' => '密码不能为空',
-//                'email.email' => '请填写一个有效的邮箱',
-//                'mobile.required' => '手机号码必填',
-//                'mobile.telephone_number' => '请填写一个有效的手机号',
-                'confirm_password.required' =>"确认密码不能为空",
-                'type_id.required' =>"用户类型不能为空",
-                'real_name.required' =>"姓名不能为空",
-                'password.min' =>"密码长度不能低于6位数",
-                'role_id.required' =>"所属角色不能为空",
+                //                'email.email' => '请填写一个有效的邮箱',
+                //                'mobile.required' => '手机号码必填',
+                //                'mobile.telephone_number' => '请填写一个有效的手机号',
+                'confirm_password.required' => "确认密码不能为空",
+                'type_id.required' => "用户类型不能为空",
+                'real_name.required' => "姓名不能为空",
+                'password.min' => "密码长度不能低于6位数",
+                'role_id.required' => "所属角色不能为空",
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if($requireData['password']!=$requireData['confirm_password']){
+        if ($requireData['password'] != $requireData['confirm_password']) {
             return Result::error("两次密码不一致");
         }
         $salt = rand(1, 999999);
@@ -69,18 +70,18 @@ class UserController extends AbstractController
         // $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id'])>0 ?end($requireData['administrative_unit_arr_id']):0;
         // $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id'])>0?json_encode($requireData['administrative_unit_arr_id']):json_encode([]);
 
-        $requireData['address_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id'])>0?end($requireData['address_arr_id']):0;
-        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id'])>0 ?json_encode($requireData['address_arr_id']):json_encode([]);
+        $requireData['address_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id']) > 0 ? end($requireData['address_arr_id']) : 0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id']) > 0 ? json_encode($requireData['address_arr_id']) : json_encode([]);
 
-        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id'])>0?end($requireData['native_place_arr_id']):0;
-        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id'])>0?json_encode($requireData['native_place_arr_id']):json_encode([]);
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id']) > 0 ? end($requireData['native_place_arr_id']) : 0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id']) > 0 ? json_encode($requireData['native_place_arr_id']) : json_encode([]);
 
-        $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id'])>0?end($requireData['city_arr_id']):0;
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id'])>0?json_encode($requireData['city_arr_id']):json_encode([]);
+        $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? end($requireData['city_arr_id']) : 0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? json_encode($requireData['city_arr_id']) : json_encode([]);
 
-        $requireData['other'] = isset($requireData['other'])?json_encode($requireData['other']):'';
+        $requireData['other'] = isset($requireData['other']) ? json_encode($requireData['other']) : '';
         $result =  $this->userServiceClient->createUser($requireData);
-        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
@@ -92,22 +93,22 @@ class UserController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id'=>'required',
-                'password'=>'required',
+                'id' => 'required',
+                'password' => 'required',
             ],
             [
-                'id.required' =>"id不能为空",
-                'password.required' =>"密码不能为空",
+                'id.required' => "id不能为空",
+                'password.required' => "密码不能为空",
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $salt = rand(1, 999999);
         $requireData['salt'] = $salt;
         $result =  $this->userServiceClient->resetPassword($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 更新用户
@@ -119,23 +120,23 @@ class UserController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'user_name' => 'required',//登陆账号
-                'type_id'=> 'required',//用户类型
+                'user_name' => 'required', //登陆账号
+                'type_id' => 'required', //用户类型
                 'real_name' => 'required',
-//                'mobile' =>'required',
-                'id'=>'required',
+                //                'mobile' =>'required',
+                'id' => 'required',
                 'role_id' => 'required',
             ],
             [
                 'user_name.required' => '用户名不能为空',
-//                'mobile.required' => '手机号码必填',
-                'type_id.required' =>"用户类型不能为空",
-                'real_name.required' =>"姓名不能为空",
-                'id.required' =>"id不能为空",
-                'role_id.required' =>"所属角色不能为空",
+                //                'mobile.required' => '手机号码必填',
+                'type_id.required' => "用户类型不能为空",
+                'real_name.required' => "姓名不能为空",
+                'id.required' => "id不能为空",
+                'role_id.required' => "所属角色不能为空",
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
@@ -144,22 +145,22 @@ class UserController extends AbstractController
         $requireData['last_login_ip'] = $loginIp;
 
         // $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id'])>0 ?end($requireData['administrative_unit_arr_id']):0;
-        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id'])>0?json_encode($requireData['administrative_unit_arr_id']):json_encode([]);
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id']) > 0 ? json_encode($requireData['administrative_unit_arr_id']) : json_encode([]);
 
-        $requireData['address_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id'])>0?end($requireData['address_arr_id']):0;
-        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id'])>0 ?json_encode($requireData['address_arr_id']):json_encode([]);
+        $requireData['address_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id']) > 0 ? end($requireData['address_arr_id']) : 0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id']) > 0 ? json_encode($requireData['address_arr_id']) : json_encode([]);
 
-        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id'])>0?end($requireData['native_place_arr_id']):0;
-        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id'])>0?json_encode($requireData['native_place_arr_id']):json_encode([]);
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id']) > 0 ? end($requireData['native_place_arr_id']) : 0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id']) > 0 ? json_encode($requireData['native_place_arr_id']) : json_encode([]);
 
-        $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id'])>0?end($requireData['city_arr_id']):0;
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id'])>0?json_encode($requireData['city_arr_id']):json_encode([]);
+        $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? end($requireData['city_arr_id']) : 0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? json_encode($requireData['city_arr_id']) : json_encode([]);
 
-        $requireData['other'] = isset($requireData['other'])?json_encode($requireData['other']):'';
+        $requireData['other'] = isset($requireData['other']) ? json_encode($requireData['other']) : '';
         $requireData['admin_id'] = Context::get("UserId");
 
         $result =  $this->userServiceClient->updateUser($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
@@ -172,19 +173,19 @@ class UserController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id'=>'required'
+                'id' => 'required'
             ],
             [
-                'id.required' =>"id不能为空",
+                'id.required' => "id不能为空",
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $result =  $this->userServiceClient->getUserInfo((int)$requireData['id']);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
@@ -194,10 +195,10 @@ class UserController extends AbstractController
      */
     public function getUserInfo()
     {
-
+        var_dump(Context::get("UserId"), '---------1-----');
         $result =  $this->userServiceClient->getUserInfo((int)Context::get("UserId"));
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         $result['data']['website_id'] =   Context::get("SiteId");
         return Result::success($result['data']);
@@ -207,7 +208,8 @@ class UserController extends AbstractController
      * 获取用户列表
      * @return array
      */
-    public function getUserList(){
+    public function getUserList()
+    {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
@@ -220,7 +222,7 @@ class UserController extends AbstractController
                 'pageSize.required' => '每页显示条数不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
@@ -228,7 +230,7 @@ class UserController extends AbstractController
         $result =  $this->userServiceClient->getUserList($requireData);
 
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
@@ -236,29 +238,29 @@ class UserController extends AbstractController
      * 删除用户
      * @return array
      */
-//    public function delUser()
-//    {
-//        $requireData = $this->request->all();
-//        $validator = $this->validationFactory->make(
-//            $requireData,
-//            [
-//                'id' => 'required'
-//            ],
-//            [
-//                'id.required' => '用户ID不能为空'
-//            ]
-//        );
-//        if ($validator->fails()){
-//            $errorMessage = $validator->errors()->first();
-//            return Result::error($errorMessage);
-//        }
-//
-//        $result =  $this->userServiceClient->delUser($requireData['id']);
-//        if ($result['code'] != ErrorCode::SUCCESS) {
-//            return Result::error($result['message'],0,[]);
-//        }
-//        return Result::success($result['data']);
-//    }
+    //    public function delUser()
+    //    {
+    //        $requireData = $this->request->all();
+    //        $validator = $this->validationFactory->make(
+    //            $requireData,
+    //            [
+    //                'id' => 'required'
+    //            ],
+    //            [
+    //                'id.required' => '用户ID不能为空'
+    //            ]
+    //        );
+    //        if ($validator->fails()){
+    //            $errorMessage = $validator->errors()->first();
+    //            return Result::error($errorMessage);
+    //        }
+    //
+    //        $result =  $this->userServiceClient->delUser($requireData['id']);
+    //        if ($result['code'] != ErrorCode::SUCCESS) {
+    //            return Result::error($result['message'],0,[]);
+    //        }
+    //        return Result::success($result['data']);
+    //    }
 
     /**
      * 查看角色信息
@@ -276,15 +278,15 @@ class UserController extends AbstractController
                 'id.required' => '角色ID不能为空'
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $result =  $this->userServiceClient->roleInfo($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
-        $result['data']['rule'] = isset($result['data']['rule'])?json_decode($result['data']['rule']):[];
+        $result['data']['rule'] = isset($result['data']['rule']) ? json_decode($result['data']['rule']) : [];
         return Result::success($result['data']);
     }
     /**
@@ -297,7 +299,7 @@ class UserController extends AbstractController
         var_dump($requireData);
         $result =  $this->userServiceClient->verifyUserInfo($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
@@ -309,13 +311,13 @@ class UserController extends AbstractController
     {
         $requireData = $this->request->all();
         $result =  $this->userServiceClient->roleList($requireData);
-        if($result['data']){
-            foreach ($result['data']['rows'] as $k=>$v) {
-                $result['data']['rows'][$k]['rule'] = $v['rule']?json_decode($v['rule']):[];
+        if ($result['data']) {
+            foreach ($result['data']['rows'] as $k => $v) {
+                $result['data']['rows'][$k]['rule'] = $v['rule'] ? json_decode($v['rule']) : [];
             }
         }
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
@@ -333,7 +335,7 @@ class UserController extends AbstractController
                 'role_name' => 'required',
                 'rule' => 'required',
                 'remark' => 'required',
-                'sort'=>'integer'
+                'sort' => 'integer'
             ],
             [
                 'role_name.required' => '角色名称不能为空',
@@ -342,15 +344,15 @@ class UserController extends AbstractController
                 'sort.integer' => '排序必须是整数',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get("UserId");
-        $requireData['rule'] = isset($requireData['rule']) && $requireData['rule']?json_encode($requireData['rule']):[];
+        $requireData['rule'] = isset($requireData['rule']) && $requireData['rule'] ? json_encode($requireData['rule']) : [];
         $result =  $this->userServiceClient->addRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
@@ -371,14 +373,14 @@ class UserController extends AbstractController
                 'id.required' => '角色ID不能为空'
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
+        $requireData['user_id'] = Context::get("UserId");
         $result =  $this->userServiceClient->delRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
@@ -405,21 +407,21 @@ class UserController extends AbstractController
                 'remark.required' => '职能描述不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get("UserId");
-        $requireData['rule'] = isset($requireData['rule']) && $requireData['rule']?json_encode($requireData['rule']):[];
+        $requireData['rule'] = isset($requireData['rule']) && $requireData['rule'] ? json_encode($requireData['rule']) : [];
         $result =  $this->userServiceClient->updateRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
 
 
-     /**
+    /**
      * 修改密码
      * @return array
      */
@@ -437,48 +439,48 @@ class UserController extends AbstractController
                 'password.required' => '密码不能为空',
                 'new_password1.required' => '确认密码不能为空',
                 'new_password1.same' => '新密码和确认密码不一致',
-                'new_password.min' =>"密码长度不能低于6位数",
+                'new_password.min' => "密码长度不能低于6位数",
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
+        $requireData['user_id'] = Context::get("UserId");
         $result =  $this->userServiceClient->changePassword($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
 
-     public function upUserStatus()
-     {
-         $requireData = $this->request->all();
-         $validator = $this->validationFactory->make(
-             $requireData,
-             [
-                 'status' => 'required',
-                 'id' => 'required'
-             ],
-             [
-                 'id.required' => 'ID不能为空',
-                 'status.required' => '状态不能为空',
-             ]
-         );
-         if ($validator->fails()){
-             $errorMessage = $validator->errors()->first();
-             return Result::error($errorMessage);
-         }
-         $result =  $this->userServiceClient->upUserStatus($requireData);
-         if ($result['code'] != ErrorCode::SUCCESS) {
-             return Result::error($result['message'],0,[]);
-         }
-         return Result::success($result['data']);
-     }
-     /**
-      * 修改用户头像和昵称
-      * @return array
+    public function upUserStatus()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'status' => 'required',
+                'id' => 'required'
+            ],
+            [
+                'id.required' => 'ID不能为空',
+                'status.required' => '状态不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result =  $this->userServiceClient->upUserStatus($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'], 0, []);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 修改用户头像和昵称
+     * @return array
      */
     public function  updateUserAvatarNickname()
     {
@@ -487,30 +489,27 @@ class UserController extends AbstractController
             $requireData,
             [
                 // 'nickname' =>'required',
-                'avatar' =>'required',
+                'avatar' => 'required',
                 // 'real_name'=>'required',
             ],
             [
                 'avatar.required' => '头像不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
+        $requireData['user_id'] = Context::get("UserId");
         //过滤掉除user_id,nickname,avatar外的数据
-        $requireData = array_filter($requireData,function($key){
-            return in_array($key,['user_id','nickname','avatar','real_name']);
-        },ARRAY_FILTER_USE_KEY);    
+        $requireData = array_filter($requireData, function ($key) {
+            return in_array($key, ['user_id', 'nickname', 'avatar', 'real_name']);
+        }, ARRAY_FILTER_USE_KEY);
         var_dump($requireData);
         $result =  $this->userServiceClient->updateUserAvatarNickname($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
-
-
-
-}
+}

+ 5 - 1
app/JsonRpc/NewsService.php

@@ -366,6 +366,10 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getDUser(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     //20250324  通知,公告,消息
     /**
      * @param array $data
@@ -520,4 +524,4 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
-}
+}

+ 81 - 80
app/JsonRpc/NewsServiceInterface.php

@@ -170,6 +170,7 @@ interface NewsServiceInterface
   public function updateNoticeStatus(array $data);
   public function updateComplaintStatus(array $data);
   public function updateGoodStatus(array $data);
+  public function getDUser(array $data);
   //20250324  通知,公告,消息
 
   /**
@@ -188,84 +189,84 @@ interface NewsServiceInterface
    */
   public function addJobRecruiting(array $data);
 
-     /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getJobRecruitingArea(array $data);
-     /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getIndustry(array $data);
-     /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getPositionList(array $data);
-     /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getJobNature(array $data);
-     /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getExperience(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getEducation(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getSalary(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getLanguage(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getLevel(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getCompanySize(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getCompanyNature(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function upJobRecruiting(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delJobRecruiting(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getJobCompany(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function upJobCompany(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function checkJobRecruiting(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getJobRecruitingArea(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getIndustry(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getPositionList(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getJobNature(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getExperience(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getEducation(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getSalary(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getLanguage(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getLevel(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getCompanySize(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getCompanyNature(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function upJobRecruiting(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function delJobRecruiting(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getJobCompany(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function upJobCompany(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function checkJobRecruiting(array $data);
 }

+ 2 - 1
config/api/news.php

@@ -85,6 +85,7 @@ Router::addGroup(
         Router::post('/deleteComplaint', [NewsController::class, 'deleteComplaint']);
         //审核
         Router::post('/updateComplaintStatus', [NewsController::class, 'updateComplaintStatus']);
+        Router::post('/getDUser', [NewsController::class, 'getDUser']);
         //20250324  通知,公告,消息
 
 
@@ -113,5 +114,5 @@ Router::addGroup(
 
         // 20250306 招聘
     },
-    ['middleware' => [FooMiddleware::class,\App\Middleware\Auth\SensitiveMiddleware::class]]
+    ['middleware' => [FooMiddleware::class, \App\Middleware\Auth\SensitiveMiddleware::class]]
 );