完善功能

app/admin/controller/member/WellnessRecordController.php

@@ -337,10 +337,12 @@ class WellnessRecordController extends Curd
                 $item->wellness_record_file_json = json_decode($item->wellness_record_file_json, true);
                 $wellnessRecordFileJson = [];
                 foreach ($item->wellness_record_file_json as $value) {
-                    $wellnessRecordFileJson[] = [
-                        'url' => getenv('STORAGE_DOMAIN') . $value['url'],
-                        'name' => $value['name']
-                    ];
+                    if (!empty($value['url']) && !empty($value['name'])){
+                        $wellnessRecordFileJson[] = [
+                            'url' => getenv('STORAGE_DOMAIN') . $value['url'],
+                            'name' => $value['name']
+                        ];
+                    }
                 }
                 $item->wellness_record_file_json = $wellnessRecordFileJson;
             }

app/admin/controller/order/WholeController.php

@@ -142,12 +142,12 @@ class WholeController extends Curd
                 $components = GoodsComponent::with('goods')
                     ->where('join_component_master_goods_id', $item['goods']['goods_id'])
                     ->select('join_component_master_goods_id', 'join_component_goods_id', 'goods_component_price',
-                        'goods_component_price', 'goods_component_config_json')
+                        'goods_component_price', 'goods_component_json')
                     ->get()
                     ->toArray();
                 $goodsArr = [];
                 foreach ($components as $component) {
-                    $configJson = !empty($component['goods_component_config_json']) ? json_decode($component['goods_component_config_json'], true) : [];
+                    $configJson = !empty($component['goods_component_json']) ? json_decode($component['goods_component_json'], true) : [];
                     if (!empty($component['goods'])) {
                         $supplierName = Supplier::where('supplier_id', $component['goods']['join_goods_supplier_id'])->value('supplier_name');
                         $goodsArr[] = [

app/admin/service/sys_manage/CategoryService.php

@@ -129,6 +129,7 @@ class CategoryService
                 'category_sort' => $params['category_sort'] ?? '',
                 'category_groupby' => $params['category_groupby'] ?? '',
                 'category_remark' => $params['category_remark'] ?? '',
+                'category_status' => $params['category_status'] ?? '',
                 'category_extend_json' => !empty($params['category_extend_json']) ? $params['category_extend_json'] : '{}',
                 'category_addtimes' => time()
             ];

app/admin/service/sys_manage/RoleService.php

@@ -22,11 +22,15 @@ class RoleService
         $page = intval($request->get('page', 1));
         $pageSize = intval($request->get('pageSize', 10));
         $keyword = format_string($request->get('keyword', ''));
+        $roleStatus = $request->get('role_status', '');
 
         $rows = SysRole::select('*')
             ->when($keyword != '', function ($query) use ($keyword) {
                 $query->where('role_name', 'like', '%' . $keyword . '%');
             })
+            ->when($roleStatus != '', function ($query) use ($roleStatus) {
+                $query->where('role_status', $roleStatus);
+            })
             ->orderBy('role_addtimes', 'DESC')
             ->forPage($page, $pageSize)
             ->get()
@@ -80,7 +84,7 @@ class RoleService
                 'role_name' => $params['role_name'],
                 'role_remark' => $params['role_remark'] ? format_string($params['role_remark']) : null,
                 'role_extend_json' => $params['role_extend_json'] ?? null,
-                'role_permission'=>'[]',
+                'role_permission' => '[]',
                 'role_addtimes' => time()
             ];