liumiao
2021-02-03 75f18f984f910d5a776b9ce70c3219e425c8d39a
Merge remote-tracking branch 'origin/master'
2 files modified
8 ■■■■ changed files
app/Http/Controllers/Api/v1/FaceController.php 2 ●●● patch | view | raw | blame | history
app/Http/Controllers/Api/v1/SystemController.php 6 ●●●● patch | view | raw | blame | history
app/Http/Controllers/Api/v1/FaceController.php
@@ -235,7 +235,7 @@
        }
        $paramArr = json_decode($request->paramJson, true);
        if(count($paramArr)!=0) {
            if(count($paramArr[0])!=4) {
            if(count($paramArr[0])!=6) {
                return $this->_response([], ResponseCode::PARAM_ERROR, '格式错误');
            }
        }
app/Http/Controllers/Api/v1/SystemController.php
@@ -140,9 +140,7 @@
            $where['b.appType'] = 2;
            $where['b.isDelete'] = 0;
            $orderBy = ["b.fsort" => 'asc'];
            $select = ["b.id as menuId", 'b.menuName', 'b.isDefault', 'b.jumpModule',
                \DB::raw("CONCAT('" . MPFILE_PATH . "', " . "b.imageChecked" . ") AS 'imageChecked'"),
                \DB::raw("CONCAT('" . MPFILE_PATH . "', " . "b.imageUnChecked" . ") AS 'imageUnChecked'")];
            $select = ["b.id as menuId", 'b.menuName', 'b.isDefault', 'b.jumpModule', "b.imageChecked", "b.imageUnChecked"];
            $query = BottomModel::queryMenuJoinList();
            $bottomMenuList = BottomModel::getDataJoinList($query, $where, $select, $orderBy)->toArray();
            foreach($bottomMenuList as $key => $val)
@@ -155,6 +153,8 @@
                    }
                    $typeNum = 1;
                }
                $bottomMenuList[$key]['imageChecked'] = $this->fun->stitchingPath($val['imageChecked']);
                $bottomMenuList[$key]['imageUnChecked'] = $this->fun->stitchingPath($val['imageUnChecked']);
            }
            $this->redis->set($_key . $deviceType . $version, json_encode($bottomMenuList, true));
        }