线上适配

jcjyhr/app/admin/controller/Index.php

@@ -40,6 +40,7 @@ class Index extends Backend
         foreach ($menus as $k=>$v) {
             foreach ($v as $kk=>$vv) {
                 $menus[$k][strtolower($kk)] = $vv;
+                unset($menus[$k][strtoupper($kk)]);
 //                if($kk == 'children') {
 //                    continue;
 //                }

jcjyhr/app/admin/controller/Option.php

@@ -210,7 +210,7 @@ class Option extends Backend
         set_time_limit(0);
         $model = new Admin();
         $res = $model
-            ->field(['id','nickname as name'])
+            ->field(['ID','ID as id','NICKNAME as name'])
             ->where('status',1)
             ->where('is_admin',1)
             ->select()

jcjyhr/app/admin/controller/auth/Admin.php

@@ -82,8 +82,16 @@ class Admin extends Backend
                 ->paginate($limit);
         }
 
+        $list = $res->items();
+        $list = (json_decode(json_encode($list), true));
+        $arr = [];
+        foreach ($list as $k=>$v) {
+            foreach ($v as $kk => $vv) {
+                $arr[$k][strtolower($kk)] = $vv;
+            }
+        }
         $this->success('', [
-            'list'   => $res->items(),
+            'list'   =>$arr,
             'total'  => $res->total(),
             'remark' => get_route_remark(),
         ]);

jcjyhr/app/admin/controller/auth/Group.php

@@ -257,6 +257,12 @@ class Group extends Backend
         if ($this->assembleTree) {
             $data = $this->tree->assembleTree($this->tree->getTreeArray($data));
         }
+        foreach ($data as $k => $v) {
+            foreach ($v as $k1 => $v1) {
+                $data[$k][strtolower($k1)] = $v1;
+                unset($data[$k][strtoupper($k1)]);
+            }
+        }
         $this->success('', [
             'options' => $data
         ]);

jcjyhr/app/admin/controller/auth/Rule.php

@@ -69,13 +69,38 @@ class Rule extends Backend
         if ($this->request->param('select')) {
             $this->select();
         }
-
+        $list = $this->getMenus();
+        foreach ($list as $k=>$v)
+        {
+            $this->makeData($v['children']);
+            foreach ($v as $key=>$value)
+            {
+                $list[$k][strtolower($key)] = $value;
+                unset($list[$k][strtoupper($key)]);
+            }
+        }
         $this->success('', [
-            'list'   => $this->getMenus(),
+            'list'   => $list,
             'remark' => get_route_remark(),
         ]);
     }
 
+    public function makeData(&$data)
+    {
+
+        if(!empty($data)){
+            foreach ($data as $k=>$v){
+                if(!empty($v['children'])){
+                    $this->makeData($v['children']);
+                }
+                foreach ($v as $k2=>$v2){
+                    $data[$k][strtolower($k2)] = $v2;
+                    unset($data[$k][strtoupper($k2)]);
+                }
+            }
+        }
+    }
+
     /**
      * 添加
      */
@@ -190,7 +215,11 @@ class Rule extends Backend
                 $this->error(__('No rows updated'));
             }
         }
-
+        $row = $row->toArray();
+        foreach ($row as $k => $value) {
+            $row[strtolower($k)] = $value;
+            unset($row[$k]);
+        }
         $this->success('', [
             'row' => $row
         ]);
@@ -229,6 +258,12 @@ class Rule extends Backend
         if ($this->assembleTree) {
             $data = $this->tree->assembleTree($this->tree->getTreeArray($data, 'title'));
         }
+        foreach ($data as $k => $v) {
+            foreach ($v as $k1 => $v1) {
+                $data[$k][strtolower($k1)] = $v1;
+                unset($data[$k][strtoupper($k1)]);
+            }
+        }
         $this->success('', [
             'options' => $data
         ]);

jcjyhr/app/admin/controller/dict/Commontable.php

@@ -58,19 +58,23 @@ class Commontable extends Backend
         // $i = 1;
         foreach ($common as $k=>$v)
         {
-            if($arr[$v['type']] ?? '')
+            if($arr[$v['TYPE']] ?? '')
             {
-                $arr[$v['type']] .= '、'.$v['code'].'-'.$v['name'];
+                $arr[$v['TYPE']] .= '、'.$v['CODE'].'-'.$v['NAME'];
                 // $i++;
             }else{
                 // $i = 1;
-                $arr[$v['type']] = $v['code'].'-'.$v['name'];
+                $arr[$v['TYPE']] = $v['CODE'].'-'.$v['NAME'];
                 // $i++;
             }
         }
         foreach ($list as $k=>$v)
         {
-            $list[$k]['area'] = $arr[$v['code']] ?? [];
+            $list[$k]['AREA'] = $arr[$v['CODE']] ?? [];
+            foreach ($v as $k1=>$v1)
+            {
+                $list[$k][strtolower($k1)] = $v1;
+            }
         }
 
         $this->success('', [

jcjyhr/app/admin/controller/institution/Depart.php

@@ -62,9 +62,17 @@ class Depart extends Backend
             ->order($order)
             ->paginate($limit);
         $res->visible(['institution' => ['name']]);
+        $list = $res->items();
+        $list = (json_decode(json_encode($list), true));
+        $arr = [];
+        foreach ($list as $k=>$v) {
+            foreach ($v as $kk => $vv) {
+                $arr[$k][strtolower($kk)] = $vv;
+            }
+        }
 
         $this->success('', [
-            'list'   => $res->items(),
+            'list'   => $list,
             'total'  => $res->total(),
             'remark' => get_route_remark(),
         ]);

jcjyhr/app/admin/controller/institution/Institution.php

@@ -63,9 +63,16 @@ class Institution extends Backend
             ->order($order)
             ->paginate($limit);
         $res->visible(['parentInstitution' => ['name']]);
-
+        $list = $res->items();
+        $list = (json_decode(json_encode($list), true));
+        $arr = [];
+        foreach ($list as $k=>$v) {
+            foreach ($v as $kk => $vv) {
+                $arr[$k][strtolower($kk)] = $vv;
+            }
+        }
         $this->success('', [
-            'list'   => $res->items(),
+            'list'   => $arr,
             'total'  => $res->total(),
             'remark' => get_route_remark(),
         ]);
@@ -277,7 +284,12 @@ class Institution extends Backend
     {
         $pk  = $this->model->getPk();
         $id  = $this->request->param($pk);
-        $row = $this->model->find($id);
+        $arr = $this->model->find($id);
+        $row = [];
+        foreach ($arr as $k=>$v)
+        {
+            $row[strtolower($k)] = $v;
+        }
         if (!$row) {
             $this->error(__('Record not found'));
         }

jcjyhr/app/admin/model/AdminRule.php

@@ -9,7 +9,7 @@ use think\Model;
  */
 class AdminRule extends Model
 {
-    protected $autoWriteTimestamp = true;
+//    protected $autoWriteTimestamp = true;
 
     public function setComponentAttr($value)
     {

jcjyhr/app/zskk/servies/WechatServies.php

@@ -60,6 +60,11 @@ class WechatServies
         if(!empty($params['sex'])){
             $where['sex'] = $params['sex'];
         }
+        $vagueWhere = '';
+        if(!empty($params['vague'])){
+            $vague = $params['vague'];
+            $vagueWhere = "depart like '%$vague%'";
+        }
         if(!empty($params['depart'])){
             $where[] = ['depart' ,'in',$params['depart']];
         }
@@ -69,7 +74,7 @@ class WechatServies
         if(!empty($params['area'])){
             $where['area'] = $params['area'];
         }
-        $list = $this->postcardModel->where($where)->where($ageWhere)->page((int)$params['page'],(int)$params['num'])->select()->toArray();
+        $list = $this->postcardModel->where($where)->where($ageWhere)->where($vagueWhere)->page((int)$params['page'],(int)$params['num'])->select()->toArray();
         $total = $this->postcardModel->where($where)->count();
         return ['list'=>$list,'total'=>$total];
     }

jcjyhr/extend/ba/Auth.php

@@ -75,14 +75,15 @@ class Auth
     {
         foreach ($rules as $key => $rule) {
             if (array_key_exists($rule['ID'], $this->children)) {
-                $children = $this->children[$rule['ID']];
-                foreach ($children as $c=>$child) {
+                $arr = $this->getChildren($this->children[$rule['ID']]);
+                $data = [];
+                foreach ($arr as $c=>$child) {
                     foreach ($child as $a=>$b)
                     {
-                        $children[$c][strtolower($a)] = $b;
+                        $data[$c][strtolower($a)] = $b;
                     }
                 }
-                $rules[$key]['children'] = $children;
+                $rules[$key]['children'] = $data;
             }
         }
         return $rules;

jcjyhr/extend/ba/Tree.php

@@ -50,6 +50,7 @@ class Tree
      */
     public static function getTreeArray(array $arr, string $field = 'name', int $level = 0, bool $superiorEnd = false): array
     {
+        $field = strtoupper($field);
         $level++;
         $number = 1;
         $total  = count($arr);
@@ -95,7 +96,7 @@ class Tree
      * @param string $pk   主键字段
      * @return array ['id' => 1, 'pid' => 0, 'title' => '标题1', 'children' => ['id' => 2, 'pid' => 1, 'title' => '标题1-1']]
      */
-    public function assembleChild(array $data, string $pid = 'pid', string $pk = 'id'): array
+    public function assembleChild(array $data, string $pid = 'PID', string $pk = 'ID'): array
     {
         if (!$data) return [];