zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20201112

Browse Source
This commit is contained in:
wangjinlei
2021-08-24 14:58:13 +08:00
parent 3ae9be1e60
commit 5c5143166c
6 changed files with 1333 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/api/controller/Admin.php
View File

@@ -40,6 +40,12 @@ class Admin extends Controller {
$this->article_author_obj = Db::name('article_author');
$this->country_obj = Db::name('country');
}
public function YLtest(){
$data = $this->request->post();
return jsonSuccess(['mycode'=>md5($data['mmm'])]);
}
/**
* 获取编辑人员列表（分页）
@@ -100,7 +106,7 @@ class Admin extends Controller {
$where['t_article.state'] = $data['state'];
} else {
if ($data['act'] == 1) {
$where['t_article.state'] = array('in', [0, 1, 2, 4]);
$where['t_article.state'] = array('in', [0, 1, 2, 4, 6]);
} else if ($data['act'] == 2) {
$where['t_article.state'] = array('in', [3, 5]);
}
@@ -326,8 +332,8 @@ class Admin extends Controller {
//接收信息
$data = $this->request->post();
// $data['journal'] = 7;
// $data['url'] = 'reviewer/import/20200826/a8c03d7f9ac899c0a590ff26663402f2.xlsx';
$data['journal'] = 5;
$data['url'] = 'reviewer/import/20210819/beb6de5c69e4878d995fd8de192d17af.xlsx';
$journal = $data['journal'];
$journal_info = $this->journal_obj->where('journal_id', $journal)->find();
@@ -340,6 +346,11 @@ class Admin extends Controller {
$su_data = [];
$er_data = [];
foreach ($frag as $v) {
if($v['username']==''){
continue;
}
//验证数据完整性
if ($v['username'] == '' || $v['email'] == '' || $v['realname'] == '' || $v['major'] == '' || $v['username'] == null || $v['email'] == null || $v['realname'] == null || $v['major'] == null) {
$er_data[] = [
@@ -531,7 +542,7 @@ class Admin extends Controller {
* 获取对应关系
*/
private function get_retojo($reviewer_id, $journal_id) {
return $this->reviewer_to_journal_obj->where('reviewer_id', $reviewer_id)->where('journal_id', $journal_id)->find();
return $this->reviewer_to_journal_obj->where('reviewer_id', $reviewer_id)->where('journal_id', $journal_id)->where('state',0)->find();
}
/**