Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

application/admin/controller/family/Family.php

@@ -99,7 +99,6 @@ class Family extends Backend
                     }
 
                     $params['family_name']=\app\admin\model\family\Surname::where(['ID'=>$params['surname_id']])->value("Surname");
-                    $params['rw_user_id']=$params['create_user_id'];
                     $result = $this->model->allowField(true)->save($params);
                     Db::commit();
                 } catch (ValidateException $e) {

application/admin/lang/zh-cn/family/family.php

@@ -14,7 +14,8 @@ return [
     'Village_id'        => '居委会',
     'Address' => '详细地址',
     'Createtime'     => '创建时间',
-    'Rw_user_id'      => '管理人员',
+    'Rw_user_id'      => '读写权限',
+    'Ro_user_id'      => '查看权限',
     'Status'         => '订单状态',
     'Status 0'       => '隐藏(软删除)',
     'Status 1'       => '显示',

application/admin/view/family/family/add.html

@@ -49,6 +49,12 @@
             <input id="c-rw_user_id" data-rule="required" data-multiple="true" data-source="user/user/index" data-search-field="id,nickname,mobile" data-primary-key="id" data-field="id" data-format-item="{id} - {nickname} - {mobile}" class="form-control selectpage" name="row[rw_user_id]" type="text" value="">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ro_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ro_user_id" data-rule="" data-multiple="true"  data-source="user/user/index" data-search-field="id,nickname,mobile" data-primary-key="id" data-field="id" data-format-item="{id} - {nickname} - {mobile}" class="form-control selectpage" name="row[ro_user_id]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/family/family/edit.html

@@ -49,6 +49,12 @@
             <input id="c-rw_user_id" data-rule="required" data-multiple="true" data-source="user/user/index" data-search-field="id,nickname,mobile" data-primary-key="id" data-field="id" data-format-item="{id} - {nickname} - {mobile}" class="form-control selectpage" name="row[rw_user_id]" type="text" value="{$row.rw_user_id}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ro_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ro_user_id" data-rule="" data-multiple="true" data-source="user/user/index" data-search-field="id,nickname,mobile" data-primary-key="id" data-field="id" data-format-item="{id} - {nickname} - {mobile}" class="form-control selectpage" name="row[ro_user_id]" type="text" value="{$row.ro_user_id}">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/Family.php

@@ -157,6 +157,7 @@ class Family extends Api
         $params['address']=$this->request->param("address");
         $params['create_user_id']=$this->auth->id;
         $params['rw_user_id']=$this->auth->id;
+        $params['ro_user_id']=$this->auth->id;
         $params['fastim_id']=$this->request->param("fastim_id");
         $params['genealogy']=$this->request->param("genealogy");
         if(xss_clean($this->request->param("family_regulation"))){
@@ -338,12 +339,13 @@ class Family extends Api
             FamilyModel::where(['id' =>$family_id])->setInc('read_records',1);
         }
         $info['rw_user_id'] = explode(",",$info['rw_user_id']);
+        $info['ro_user_id'] = explode(",",$info['ro_user_id']);
 
         $info['is_show'] = false;
 
         $familyTreePeople=FamilyTreeModel::myFamilyTreePeople(["ft.family_id"=>$family_id,'fp.user_id'=>$this->auth->id]);
 
-        if(in_array($this->auth->id,$info['rw_user_id']) || $familyTreePeople ){
+        if(in_array($this->auth->id,$info['rw_user_id']) || $familyTreePeople || in_array($this->auth->id,$info['ro_user_id'])){
             $info['is_show'] = true;
         }