zhanglinxin 1 year ago
parent
commit
59e1ca9c7b

+ 5 - 1
application/approve/view/approve_info/form_5.html

@@ -126,9 +126,13 @@
                     <label class="layui-form-label color-green font-w7">同行人员</label>
                     <div class="layui-input-block">
                         <table class="layui-table">
+                            <thead>
+                            <tr>
+                                <th class='text-left nowrap'>名称</th>
+                            </tr>
+                            </thead>
                             {foreach $vo.peer_user as $k=>$v}
                             <tr>
-                                <td style="width: 20%">名称</td>
                                 <td>{$v.name|default='--'}</td>
                             </tr>
                             {/foreach}

+ 2 - 1
application/common/service/ApproveInfoService.php

@@ -812,9 +812,10 @@ class ApproveInfoService
                     ];
                     $create_user = $apply_user;
                     if (in_array($module, [CommonConstant::MODULE_5, CommonConstant::MODULE_6, CommonConstant::MODULE_7])) {
+
                         if ($info['user_id'] != $info['apply_user_id']) {
                             $apply_user_info = User::field('id,userid,name,avatar')
-                                ->where('userid', $info['userid'])
+                                ->where('userid', $info['user_id'])
                                 ->find();
                             $create_user = [
                                 'id' => $apply_user_info['id'],