Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Resigninfo.php

@@ -62,7 +62,7 @@ class Resigninfo extends Base
         $hand = resign_hand_user($this->uid,0);
         if (!empty($role[DataGroupModel::$type_全部])) {
         	$arr= array_unique(array_merge($hand,$role[DataGroupModel::$type_全部]));
-			$where[] = ['hand_uid', 'in',$arr];
+			$where[] = ['hand_uid|resign_uid', 'in',$arr];
         }
 
         $count = Db::name('resign_info')->where($where)->count();