用户

application/admin/view/user/user/edit.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gangwei_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-gangwei_id" min="0" data-rule="required" data-source="usergangwei/selectpage" class="form-control selectpage" name="row[gangwei_id]" type="text" value="{$row.gangwei_id|htmlentities}">
+            <!--<input id="c-gangwei_id" min="0" data-rule="required" data-source="usergangwei/selectpage" class="form-control selectpage" name="row[gangwei_id]" type="text" value="{$row.gangwei_id|htmlentities}">-->
             <select id="c-gangwei_id" data-rule="required" class="form-control selectpicker" name="row[gangwei_id]">
                 <option value="0" selected>无</option>
                 {foreach name="gangweilist" item="vo"}
@@ -15,11 +15,11 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Jigou_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-jigou_id" data-rule="required" data-source="userjigou/selectpage" class="form-control selectpage" name="row[jigou_id]" type="text" value="{$row.jigou_id|htmlentities}">
+            <!--<input id="c-jigou_id" data-rule="required" data-source="userjigou/selectpage" class="form-control selectpage" name="row[jigou_id]" type="text" value="{$row.jigou_id|htmlentities}">-->
             <select id="c-jigou_id" data-rule="required" class="form-control selectpicker" name="row[jigou_id]">
                 <option value="0" selected>无</option>
                 {foreach name="jigoulist" item="vo"}
-                <option value="{$vo.id}" {eq name="vo.id" value="$row.gangwei_id"}selected{/eq}>{$vo.name}</option>
+                <option value="{$vo.id}" {eq name="vo.id" value="$row.jigou_id"}selected{/eq}>{$vo.name}</option>
                 {/foreach}
             </select>
         </div>

application/common/library/Auth.php

@@ -417,6 +417,11 @@ class Auth
         $allowFields = $this->getAllowFields();
         $userinfo = array_intersect_key($data, array_flip($allowFields));
         $userinfo = array_merge($userinfo, Token::get($this->_token));
+
+        if($this->idcard_status == 1){
+            $userinfo['nickname'] = Db::name('user_idconfirm')->where('user_id',$this->id)->value('truename');
+        }
+
         return $userinfo;
     }