edit

app/Http/Controllers/Api/SystemsManage/RoleSetController.php

 <?php
 namespace App\Http\Controllers\Api\SystemsManage;
 
+use App\Models\BasicManagement\Admin;
 use App\Services\BasicManagement\RoleSetService;
 use App\Services\CommonService;
 use Illuminate\Http\Request;
@@ -374,6 +375,7 @@ class RoleSetController extends Controller
         if ($request['type'] == 1) {
             // 获取当前操作账号信息
             $user_info = Common::getUserInfo($request['api_token']);
+            $adm_role = Admin::where("adm_id",$user_info->adm_id)->value('adm_role');
             // 获取角色权限
             $find_role = DB::table('role')
                 ->where('rol_id', $request['rol_id'])
@@ -382,6 +384,12 @@ class RoleSetController extends Controller
             if ($find_role->rol_type == 1 && $user_info->adm_shop_id !=2 ) {//店主
                 return response()->json(['code'=>500, 'msg'=>'店主角色不能进行编辑', 'data'=>'店主角色不能进行编辑']);
             }
+            $rol_privilege_multiples = DB::table('role')
+                ->where('rol_id', $adm_role)
+                ->value( 'rol_privilege_multiple');
+            $rol_privilege_multiples = json_decode($rol_privilege_multiples, true);
+            $rol_privileges = explode(',', $rol_privilege_multiples['applet']);
+
             $rol_privilege_multiple = json_decode($find_role->rol_privilege_multiple, true);
             $show = 1;
             if($user_info->adm_shop_id == 2 ){
@@ -419,7 +427,11 @@ class RoleSetController extends Controller
             // 微信小程序角色
             $rol_privilege = explode(',', $rol_privilege_multiple['applet']);
             $data['applet']['rol_privilege'] = array_values($rol_privilege);
+            if($show == 1) {
+                $privileges_info = DB::table('privileges_technician_applet')->where('pri_show', 1)->whereIn('pri_id',$rol_privileges)->get();
+            }else {
                 $privileges_info = DB::table('privileges_technician_applet')->where('pri_show', 1)->get();
+            }
             $rol_subordinate = [];
             foreach ($privileges_info as $key => $value) {
                 $find_son = DB::table('privileges_technician_applet')->where('pri_fid', $value->pri_id)->get()->toArray();
@@ -434,7 +446,7 @@ class RoleSetController extends Controller
             // $data['applet']['rol_subordinate'] = array_diff($data['applet']['rol_privilege'], explode(',', $rol_privilege_multiple['applet']));
             $data['applet']['privileges_info'] = $privileges_info;
 
-            return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$data]);
+            return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$data,'rol_privileges'=>$rol_privileges,'rol_privilege'=>$rol_privilege]);
         } else {
             // 提交
             $error_message = $verify_data->additionSubmitValidator($request->all());
@@ -537,7 +549,7 @@ class RoleSetController extends Controller
         foreach ($find_data as $key => $value) {
             $rol_name[] = $value->rol_name;
             if ($value->rol_type == 1) {
-                return response()->json(['code'=>500, 'msg'=>'error', 'data'=>'店长权限不允许停用']);
+                return response()->json(['code'=>500, 'msg'=>'总权限不允许停用', 'data'=>'店长权限不允许停用']);
             }
         }
 

app/Http/Controllers/Mounting/Business/WashWorkController.php

@@ -688,7 +688,7 @@ class WashWorkController extends Controller
                 ->first();
             $find_com_img = DB::table('completion_info')
                 ->where('coin_wor_id', $request['wor_id'])
-                ->where('coin_type', 3)
+                ->where('coin_type', 2)
                 // ->where('coin_must', 1)
                 ->select('coin_wor_id', 'coin_type', 'coin_data')
                 ->get()->toArray();