From 3a97605c1c5a3d88508bf02af2a9e6c7ea4e51b0 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 22 Mar 2023 13:35:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/nk/Street.php | 1 + app/admin/controller/nk/Village.php | 2 +- app/admin/view/nk/street/add.html | 6 +----- app/admin/view/nk/street/edit.html | 6 +----- app/admin/view/nk/street/read.html | 4 ++-- app/admin/view/nk/village/add.html | 12 ++++-------- app/admin/view/nk/village/edit.html | 4 ---- app/admin/view/nk/village/read.html | 2 +- app/api/controller/Article.php | 5 ++--- app/api/controller/Cultural.php | 5 ++--- app/api/controller/MyArticle.php | 5 ++--- 11 files changed, 17 insertions(+), 35 deletions(-) diff --git a/app/admin/controller/nk/Street.php b/app/admin/controller/nk/Street.php index 39998da..e086de4 100644 --- a/app/admin/controller/nk/Street.php +++ b/app/admin/controller/nk/Street.php @@ -81,6 +81,7 @@ class Street extends BaseController $params['address']='泸州市'.$area_code.$street_code; $params['createtime']=time(); + $params['people_num']=0; $res=Db::table('fa_szxc_village')->strict(false)->field(true)->insertGetId($params); if ($res){ return to_assign(0,'操作成功',['aid'=>$res]); diff --git a/app/admin/controller/nk/Village.php b/app/admin/controller/nk/Village.php index fdda87f..8ac11e0 100644 --- a/app/admin/controller/nk/Village.php +++ b/app/admin/controller/nk/Village.php @@ -110,13 +110,13 @@ class Village extends BaseController $village_id=Db::table('fa_geo_village')->where('village_id',$params['village_id'])->value('village_name'); $params['address']='泸州市'.$area_code.$street_code.$village_id; $params['createtime']=time(); + $params['people_num']=0; $res=Db::table('fa_szxc_village')->strict(false)->field(true)->insertGetId($params); if ($res){ return to_assign(0,'操作成功',['aid'=>$res]); } return to_assign(1, '操作失败，原因：'.$res); } - if($this->adminInfo['position_id'] != 1){ //不是超级管理员 $www['admin_id'] = $this->adminInfo['id']; $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); diff --git a/app/admin/view/nk/street/add.html b/app/admin/view/nk/street/add.html index 9ad1bbd..bbc282b 100644 --- a/app/admin/view/nk/street/add.html +++ b/app/admin/view/nk/street/add.html @@ -22,11 +22,7 @@ - 人数* - - - 标签(多选)* + 标签 diff --git a/app/admin/view/nk/street/edit.html b/app/admin/view/nk/street/edit.html index d59c1e3..bc4fa9a 100644 --- a/app/admin/view/nk/street/edit.html +++ b/app/admin/view/nk/street/edit.html @@ -22,11 +22,7 @@ - 人数* - - - 标签(多选)* + 标签 diff --git a/app/admin/view/nk/street/read.html b/app/admin/view/nk/street/read.html index 7054e71..81040e7 100644 --- a/app/admin/view/nk/street/read.html +++ b/app/admin/view/nk/street/read.html @@ -19,8 +19,8 @@ {$detail.people_num} 标签(多选)* - - + + diff --git a/app/admin/view/nk/village/add.html b/app/admin/view/nk/village/add.html index 33e98ba..b337395 100644 --- a/app/admin/view/nk/village/add.html +++ b/app/admin/view/nk/village/add.html @@ -22,11 +22,7 @@ - 人数* - - - 标签(多选)* + 标签(多选) @@ -114,8 +110,8 @@ const editorType = '{$editor}'; var moduleInit = ['tool', 'tagpicker', 'tinymce']; var group_access = "{:session('gougu_admin')['group_access']}" - var area_id = "{$detail.area_id}" - var street_id = "{$detail.street_id}" + var area_id = "{$detail.area_id|default=0}" + var street_id = "{$detail.street_id|default=0}" var admin_id = "{$admin_id}" function gouguInit() { var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker; @@ -148,7 +144,7 @@ var demo1 = xmSelect.render({ name: 'street_id', el: '#demo1', - initValue: group_access == 2 ||group_access == 4? ["{$detail.street_id}"] : [], + initValue: group_access == 2 ||group_access == 4? ["{$detail.street_id|default=0}"] : [], prop: { name: 'name', value: 'code', diff --git a/app/admin/view/nk/village/edit.html b/app/admin/view/nk/village/edit.html index 6bd1b66..a9a8c8c 100644 --- a/app/admin/view/nk/village/edit.html +++ b/app/admin/view/nk/village/edit.html @@ -22,10 +22,6 @@ - 人数* - - 标签(多选)* diff --git a/app/admin/view/nk/village/read.html b/app/admin/view/nk/village/read.html index ed57d0c..9ceaf1d 100644 --- a/app/admin/view/nk/village/read.html +++ b/app/admin/view/nk/village/read.html @@ -20,7 +20,7 @@ 标签(多选)* - + diff --git a/app/api/controller/Article.php b/app/api/controller/Article.php index ae7f590..d864dee 100644 --- a/app/api/controller/Article.php +++ b/app/api/controller/Article.php @@ -404,9 +404,8 @@ class Article extends BaseController } $find['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name'); } - $config_find = Db::table('fa_config')->where('id', 20)->find(); - //是否查询提案数 - if (in_array($value['category_id'], explode(',', $config_find['value']))) { + //是否查询提案数 分类id + if (in_array($value['category_id'],[152,147,165,164,163,162,161,160,148,149,150])) { //提案总数 $where = [ ['category_id', '=', $value['category_id']], diff --git a/app/api/controller/Cultural.php b/app/api/controller/Cultural.php index 38b6134..a7bb67a 100644 --- a/app/api/controller/Cultural.php +++ b/app/api/controller/Cultural.php @@ -438,9 +438,8 @@ class Cultural extends BaseController } $find['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name'); } - $config_find = Db::table('fa_config')->where('id', 20)->find(); - //是否查询提案数 - if (in_array($value['category_id'], explode(',', $config_find['value']))) { + //是否查询提案数 分类id + if (in_array($value['category_id'],[152,147,165,164,163,162,161,160,148,149,150])) { //提案总数 $where = [ ['category_id', '=', $value['category_id']], diff --git a/app/api/controller/MyArticle.php b/app/api/controller/MyArticle.php index e52debd..4c6b1bc 100644 --- a/app/api/controller/MyArticle.php +++ b/app/api/controller/MyArticle.php @@ -116,9 +116,8 @@ class MyArticle extends BaseController $find = $user; } } - $config_find = Db::table('fa_config')->where('id', 20)->find(); - //是否查询提案数 - if (in_array($value['category_id'], explode(',', $config_find['value']))) { + //是否查询提案数 //分类id + if (in_array($value['category_id'], [152,147,165,164,163,162,161,160,148,149,150])) { //提案总数 $where = [ ['category_id', '=', $value['category_id']],