fix:storay中任务任务展示问题
This commit is contained in:
@@ -68,7 +68,6 @@ class Story extends Common
|
|||||||
->where('u.user_type', 1)
|
->where('u.user_type', 1)
|
||||||
->where('u.id', $opStory['story_manager'])
|
->where('u.id', $opStory['story_manager'])
|
||||||
->find();
|
->find();
|
||||||
|
|
||||||
if (null != $ret)
|
if (null != $ret)
|
||||||
{
|
{
|
||||||
$opStory['story_managername'] = $ret['staff_name'];
|
$opStory['story_managername'] = $ret['staff_name'];
|
||||||
@@ -193,15 +192,15 @@ class Story extends Common
|
|||||||
->where('story_id', $param['story_id'])
|
->where('story_id', $param['story_id'])
|
||||||
->find();
|
->find();
|
||||||
if ($story_info) {
|
if ($story_info) {
|
||||||
|
|
||||||
$user = new User();
|
|
||||||
|
|
||||||
$story_info_member = explode(',', $story_info['story_member']);
|
$story_info_member = explode(',', $story_info['story_member']);
|
||||||
foreach ($story_info_member as $memberId) {
|
foreach ($story_info_member as $memberId) {
|
||||||
|
$ret = db('system_user')->alias('u')
|
||||||
$user_info = $user->GetUserInfoByLoginId($memberId);
|
->join('hr_staff s','s.staff_id=u.user_id', 'left')
|
||||||
$item['id'] = $user_info['id'];
|
->where('u.user_type', 1)
|
||||||
$item['staff_name'] = $user_info['name'];
|
->where('u.id', $memberId)
|
||||||
|
->find();
|
||||||
|
$item['id'] = $memberId;
|
||||||
|
$item['staff_name'] = $ret['staff_name'];
|
||||||
$array[] = $item;
|
$array[] = $item;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -247,8 +246,13 @@ class Story extends Common
|
|||||||
$user = new User();
|
$user = new User();
|
||||||
for ($i=0; $i<count($opTasks);$i++)
|
for ($i=0; $i<count($opTasks);$i++)
|
||||||
{
|
{
|
||||||
$user_info = $user->GetUserInfoByLoginId($opTasks[$i]['task_processor']);
|
// $user_info = $user->GetUserInfoByLoginId($opTasks[$i]['task_processor']);
|
||||||
$opTasks[$i]['task_processor_name'] = $user_info['name'];
|
$ret = db('system_user')->alias('u')
|
||||||
|
->join('hr_staff s','s.staff_id=u.user_id', 'left')
|
||||||
|
->where('u.user_type', 1)
|
||||||
|
->where('u.id', $opTasks[$i]['task_processor'])
|
||||||
|
->find();
|
||||||
|
$opTasks[$i]['task_processor_name'] = $ret['staff_name'];
|
||||||
}
|
}
|
||||||
return $this->sendSuccess($opTasks);
|
return $this->sendSuccess($opTasks);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user