mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '2c8a41fc4fee222a3e823c58512683d27bc4f262'

Browse Source
This commit is contained in:
monanxiao 2023-03-20 13:38:24 +08:00
commit 5551e71140
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/admin/controller/nk/User.php
View File

@ -6,7 +6,9 @@ use app\admin\BaseController;
use think\facade\View; use think\facade\View;
use think\facade\Db; use think\facade\Db;
use app\admin\model\ShopUser;
use app\admin\model\InformationUserMsg; use app\admin\model\InformationUserMsg;
use app\admin\model\InformationUserAddress;
/** /**
* 文章 * 文章
@ -81,6 +83,7 @@ class User extends BaseController
$mmm['brigade_id'] = $post['brigade_id']; $mmm['brigade_id'] = $post['brigade_id'];
} }
} }
//权限组信息 //权限组信息
$total = InformationUserMsg::alias('m') $total = InformationUserMsg::alias('m')
->where($mmm) ->where($mmm)
@ -91,16 +94,11 @@ class User extends BaseController
->where($mmm) ->where($mmm)
->where($map) ->where($map)
// ->join(['shop.eb_user' => 'u'], 'm.user_id=u.uid')u.avatar,u.group_id,u.status, // ->join(['shop.eb_user' => 'u'], 'm.user_id=u.uid')u.avatar,u.group_id,u.status,
->field('m.user_id id,m.name,m.phone,m.gender,m.age,m.householder_id,m.user_id') ->with(['user.userGroup'])
->withAttr('shop_info', function ($value, $data) { // ->field('m.user_id id,m.name,m.phone,m.gender,m.age,m.householder_id,m.user_id')
$find=Db::connect('shop')->name('user')->where('uid',$data['user_id'])->field('uid,avatar,status,group_id')->find();
if (!$find) return false;
$find['group_name']=Db::connect('shop')->name('user_group')->where('group_id',$find['group_id'])->value('group_name');
return $find;
})
->withAttr('count', function ($value, $data) { ->withAttr('count', function ($value, $data) {
if ($data['householder_id'] != 0) { if ($data['householder_id']) {
$count = Db::table('fa_szxc_information_usermsg')->where('householder_id', $data['householder_id'])->count(); $count = InformationUserMsg::where('householder_id', $data['householder_id'])->count();
} else { } else {
$count = '未绑定户主无法查询'; $count = '未绑定户主无法查询';
} }
@ -389,6 +387,7 @@ class User extends BaseController
public function read() public function read()
{ {
$params = get_params(); $params = get_params();
$find = Db::table('fa_szxc_information_usermsg') $find = Db::table('fa_szxc_information_usermsg')
->withAttr('gender', function ($value, $data) { ->withAttr('gender', function ($value, $data) {
if ($value == 1) { if ($value == 1) {
@ -409,6 +408,7 @@ class User extends BaseController
return Db::table('fa_category')->where('id', $value)->value('name'); return Db::table('fa_category')->where('id', $value)->value('name');
}) })
->where('user_id', $params['id'])->find(); ->where('user_id', $params['id'])->find();
//家庭信息 //家庭信息
//用户id //用户id
$user_id = $params['id']; $user_id = $params['id'];
@ -435,7 +435,7 @@ class User extends BaseController
->order('id desc') ->order('id desc')
->field("id,user_id,name,age,gender,family_num,political_outlook,householder_id,is_hz,address_name,family_relation,phone") ->field("id,user_id,name,age,gender,family_num,political_outlook,householder_id,is_hz,address_name,family_relation,phone")
->withAttr('avatar', function ($value, $data) { ->withAttr('avatar', function ($value, $data) {
return Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->value('avatar'); return ShopUser::where('uid', $data['user_id'])->value('avatar');
}) })
->select()->toArray(); ->select()->toArray();
if ($find['householder_id'] == $find['user_id']) { if ($find['householder_id'] == $find['user_id']) {
@ -542,6 +542,7 @@ class User extends BaseController
{ {
$params = get_params(); $params = get_params();
if (request()->isPost()) { if (request()->isPost()) {
$admin = Db::name('Admin')->where('user_id', $params['id'])->find(); $admin = Db::name('Admin')->where('user_id', $params['id'])->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $params['id'])->find(); $user = Db::connect('shop')->table('eb_user')->where('uid', $params['id'])->find();
@ -630,16 +631,19 @@ class User extends BaseController
$salt = set_salt(20); $salt = set_salt(20);
$data = [ $data = [
'user_id' => $params['id'], 'user_id' => $params['id'],
'username' => $user['phone'], // 'username' => $user['mobile'], // --- 原来的废弃
'username' => $phone,
'nickname' => $user['nickname'], 'nickname' => $user['nickname'],
'thumb' => $user['avatar'], 'thumb' => $user['avatar'],
'mobile' => $user['phone'], // 'mobile' => $user['mobile'], // --- 原来的废弃
'mobile' => $phone,
'did' => 1, 'did' => 1,
'position_id' => 3, 'position_id' => 3,
'salt' => $salt, 'salt' => $salt,
'pwd' => set_password(123456, $salt), 'pwd' => set_password(123456, $salt),
'email' => '', 'email' => '',
]; ];
Db::startTrans(); Db::startTrans();
try { try {
$w['user_id'] = $params['id']; $w['user_id'] = $params['id'];
@ -714,8 +718,8 @@ class User extends BaseController
} }
} }
$user = Db::connect('shop')->table('eb_user')->where('uid', $params['id'])->field('uid id,nickname,group_id')->find(); // $user = Db::connect('shop')->table('eb_user')->where('uid', )->->find();
$user = ShopUser::field('uid id,nickname,group_id')->find($params['id']);
// $geo_brigade = Db::table('fa_geo_brigade')->select(); // $geo_brigade = Db::table('fa_geo_brigade')->select();
$useraddress = [ $useraddress = [
@ -727,7 +731,9 @@ class User extends BaseController
'admin_group' => 0, 'admin_group' => 0,
'auth_range' => 1, 'auth_range' => 1,
]; ];
$address = Db::table('fa_szxc_information_useraddress')->where('user_id', $params['id'])->find();
$address = InformationUserAddress::where('user_id', $params['id'])->find();
if ($address) { if ($address) {
$useraddress['area_id'] = $address['area_id']; $useraddress['area_id'] = $address['area_id'];
$useraddress['street_id'] = $address['street_id']; $useraddress['street_id'] = $address['street_id'];
@ -740,6 +746,7 @@ class User extends BaseController
$useraddress['admin_group'] = $admin['group_id']; $useraddress['admin_group'] = $admin['group_id'];
} }
} }
//权限组信息 //权限组信息
$groupwhere[] = ['id', '<>', 1]; $groupwhere[] = ['id', '<>', 1];
if ($this->adminInfo['group_access'] != 1) { //不是超级管理员 if ($this->adminInfo['group_access'] != 1) { //不是超级管理员
@ -777,10 +784,13 @@ class User extends BaseController
->limit(30) ->limit(30)
->select(); ->select();
$groupdata[] = ['id' => 0, 'title' => '无后台权限']; $groupdata[] = ['id' => 0, 'title' => '无后台权限'];
//前端权限 //前端权限
$user_group = Db::connect('shop')->table('eb_user_group') $user_group = Db::connect('shop')
->table('eb_user_group')
->limit(30) ->limit(30)
->select(); ->select();
View::assign('id', $params['id']); View::assign('id', $params['id']);
View::assign('user_group', $user_group); View::assign('user_group', $user_group);
View::assign('groupdata', $groupdata); View::assign('groupdata', $groupdata);

12
app/admin/view/nk/user/index.html
View File

@ -151,7 +151,7 @@
},{ },{
field: 'group_name', field: 'group_name',
title: '角色组', title: '角色组',
templet: '<div>{{ d.shop_info.group_name }}</div>', templet: '<div>{{ d.user.userGroup.group_name }}</div>',
},{ },{
field: 'name', field: 'name',
@ -165,7 +165,7 @@
field: 'user', field: 'user',
title: '头像', title: '头像',
align: 'center', align: 'center',
templet: '<div><img src="{{ d.shop_info.avatar }}" style="width:30px; height:30px;"></div>', templet: '<div><img src="{{ d.user.avatar }}" style="width:30px; height:30px;"></div>',
},{ },{
field: 'gender', field: 'gender',
title: '性别', title: '性别',
@ -178,7 +178,7 @@
fixed: 'right', fixed: 'right',
field: 'right', field: 'right',
title: '操作', title: '操作',
toolbar: '#barDemo', toolbar: '#barDemo',
align: 'center' align: 'center'
} }
] ]
@ -197,13 +197,13 @@
table.on('tool(article)', function(obj) { table.on('tool(article)', function(obj) {
var data = obj.data; var data = obj.data;
if (obj.event === 'read') { if (obj.event === 'read') {
tool.side('{$url[4]}?id='+obj.data.id); tool.side('{$url[4]}?id='+obj.data.user_id);
} }
else if (obj.event === 'edit') { else if (obj.event === 'edit') {
tool.side('{$url[2]}?id='+obj.data.id); tool.side('{$url[2]}?id='+obj.data.user_id);
} }
else if (obj.event === 'auths') { else if (obj.event === 'auths') {
tool.side('/admin/nk.user/auths?id='+obj.data.id); tool.side('/admin/nk.user/auths?id='+obj.data.user_id);
} }
else if (obj.event === 'del') { else if (obj.event === 'del') {
layer.confirm('确定要删除该记录吗?', { layer.confirm('确定要删除该记录吗?', {