|
@@ -3,10 +3,28 @@
|
|
|
|
|
|
namespace app\Admin\controller;
|
|
|
use app\BaseController;
|
|
|
+use think\App;
|
|
|
use think\facade\Db;
|
|
|
|
|
|
class Role extends BaseController
|
|
|
{
|
|
|
+
|
|
|
+ public function __construct(App $app)
|
|
|
+ {
|
|
|
+ parent::__construct($app);
|
|
|
+ $post =$this->request->post();
|
|
|
+// $token = isset($post['token']) ? trim($post['token']) : "";
|
|
|
+// if($token==""){
|
|
|
+// return error_show(101,'token不能为空');
|
|
|
+//
|
|
|
+// }
|
|
|
+// $effetc = VerifyTokens($token);
|
|
|
+// if(!empty($effetc) && $effetc['code']!=0){
|
|
|
+// return error_show($effetc['code'],$effetc['message']);
|
|
|
+//
|
|
|
+// }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* @param status
|
|
|
* @param role_name
|
|
@@ -18,24 +36,20 @@ class Role extends BaseController
|
|
|
*/
|
|
|
public function RoleList(){
|
|
|
$post =$this->request->post();
|
|
|
- $token = isset($post['token']) ? trim($post['token']) : "";
|
|
|
- if($token==""){
|
|
|
- return error_show(101,'token不能为空');
|
|
|
- }
|
|
|
- $effetc = VerifyTokens($token);
|
|
|
- if(!empty($effetc) && $effetc['code']!=0){
|
|
|
- return error_show($effetc['code'],$effetc['message']);
|
|
|
- }
|
|
|
+
|
|
|
$condition=[];
|
|
|
isset($post['status'])&&$post['status']!=="" ? $condition[]=['a.status',"=",$post['status']]:"";
|
|
|
isset($post['role_name'])&&$post['role_name']!=="" ? $condition[]=['a.role_name',"like","%".$post['role_name']."%"]:"";
|
|
|
- isset($post['level'])&&$post['level']!=="" ? $condition[]=["a.level","=",$post['level']]:"";
|
|
|
+ isset($post['item'])&&$post['item']!=="" ? $condition[]=["a.item","=",$post['item']]:"";
|
|
|
+ isset($post['createrId'])&&$post['createrId']!=="" ? $condition[]=["a.createrId","=",$post['createrId']]:"";
|
|
|
$roleList = Db::name("role");
|
|
|
$count =$roleList->alias("a")->where($condition)->count();
|
|
|
- $page = isset($post['page']) ? intval($post['page']) : 1;
|
|
|
- $size = isset($post['size']) ? intval($post['size']) : 10;
|
|
|
+ $page = isset($post['page'])&& $post['page']!=''? intval($post['page']) : 1;
|
|
|
+ $size = isset($post['size'])&& $post['size']!=''? intval($post['size']) : 10;
|
|
|
$page >=ceil($count/$size) ? $page=ceil($count/$size) :"";
|
|
|
- $list=$roleList->alias("a")->leftJoin("cfp_role_action t","a.id=t.role_id")->field("a.*,t.action_conllect as action,t.action_data")->where($condition)->page($page,$size)->select();
|
|
|
+ $list=$roleList->alias("a")->leftJoin("role_action t","a.id=t.role_id")->leftJoin("company_item i","a
|
|
|
+ .item=i.id")->field("a.*,i.name as item_name,t.action_conllect as action,t.action_data")->where($condition)
|
|
|
+ ->page($page,$size)->select();
|
|
|
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
|
|
}
|
|
@@ -51,13 +65,13 @@ class Role extends BaseController
|
|
|
*/
|
|
|
public function RoleAdd(){
|
|
|
$post =$this->request->post();
|
|
|
- $token = isset($post['token']) ? trim($post['token']) : "";
|
|
|
- if($token==""){
|
|
|
- return error_show(101,'token不能为空');
|
|
|
- }
|
|
|
- $effetc = VerifyTokens($token);
|
|
|
- if(!empty($effetc) && $effetc['code']!=0){
|
|
|
- return error_show($effetc['code'],$effetc['message']);
|
|
|
+ $creater= GetUserInfo($post['token']);
|
|
|
+ if(isset($creater['code'])&&$creater['code']==0){
|
|
|
+ $uid= isset($userinfo['data']['id']) ? $userinfo['data']['id']: "0";
|
|
|
+ $username = isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname']: "";
|
|
|
+ }else{
|
|
|
+ $username = '';
|
|
|
+ $uid= 0;
|
|
|
}
|
|
|
$rolename = isset($post['role_name']) ? trim($post['role_name']) : "";
|
|
|
if($rolename==""){
|
|
@@ -67,10 +81,27 @@ class Role extends BaseController
|
|
|
if($isT){
|
|
|
return error_show(1002,"角色名称已存在");
|
|
|
}
|
|
|
- $level = isset($post['level']) ? intval($post['level']) : "";
|
|
|
- if($level==""){
|
|
|
- return error_show(1003,"角色等级不能为空");
|
|
|
+ $role_code= isset($post['role_code'])&&$post['role_code']!=''?trim($post['role_code']) :"";
|
|
|
+ if($role_code==""){
|
|
|
+ return error_show(1002,"参数role_code 不能为空");
|
|
|
+ }
|
|
|
+ $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
|
|
|
+ if($isCode){
|
|
|
+ return error_show(1002,"角色编号已存在");
|
|
|
+ }
|
|
|
+ $item = isset($post['item']) ? trim($post['item']) : "";
|
|
|
+ if($item==""){
|
|
|
+ return error_show(1003,"参数item 不能为空");
|
|
|
}
|
|
|
+ $iteminfo = Db::name('company_item')->where('id',"=",$item)->find();
|
|
|
+ if(empty($iteminfo) || $iteminfo['is_del']==1){
|
|
|
+ return error_show(1003,"该部门不存在");
|
|
|
+ }
|
|
|
+ $level = isset($post['level']) ? intval($post['level']) : 0;
|
|
|
+ $remark = isset($post['remark']) ? trim($post['remark']) : '';
|
|
|
+// if($level==""){
|
|
|
+// return error_show(1003,"参数不能为空");
|
|
|
+// }
|
|
|
$action = isset($post['action'])&&is_array($post['action']) ? implode(",",$post['action']) : "";
|
|
|
if($action==""){
|
|
|
return error_show(1004,"功能权限不能为空");
|
|
@@ -85,10 +116,15 @@ class Role extends BaseController
|
|
|
try {
|
|
|
$list = [
|
|
|
"role_name"=>$rolename,
|
|
|
+ "role_code"=>$role_code,
|
|
|
"status"=>1,
|
|
|
+ 'creater'=>$username,
|
|
|
+ 'createrId'=>$uid,
|
|
|
"addtime"=>date("Y-m-d H:i:s"),
|
|
|
"updatetime"=>date("Y-m-d H:i:s"),
|
|
|
"level"=>$level,
|
|
|
+ "desc"=>$remark,
|
|
|
+ "item"=>$item,
|
|
|
];
|
|
|
$role= Db::name("role")->insert($list,true);
|
|
|
|
|
@@ -108,11 +144,11 @@ class Role extends BaseController
|
|
|
return app_show(0,"新建成功");
|
|
|
}else{
|
|
|
Db::rollback();
|
|
|
- return app_show(1005,"权限录入失败");
|
|
|
+ return error_show(1005,"权限录入失败");
|
|
|
}
|
|
|
}else{
|
|
|
Db::rollback();
|
|
|
- return app_show(1006,"角色新建失败");
|
|
|
+ return error_show(1006,"角色新建失败");
|
|
|
}
|
|
|
|
|
|
}catch (\Exception $e){
|
|
@@ -128,22 +164,20 @@ class Role extends BaseController
|
|
|
*/
|
|
|
public function RoleInfo(){
|
|
|
$post =$this->request->post();
|
|
|
- $token = isset($post['token']) ? trim($post['token']) : "";
|
|
|
- if($token==""){
|
|
|
- return error_show(101,'token不能为空');
|
|
|
- }
|
|
|
- $effetc = VerifyTokens($token);
|
|
|
- if(!empty($effetc) && $effetc['code']!=0){
|
|
|
- return error_show($effetc['code'],$effetc['message']);
|
|
|
- }
|
|
|
+
|
|
|
$roleid= isset($post['roleid']) ? trim($post['roleid']) : "";
|
|
|
if($roleid==""){
|
|
|
return error_show(1001,'roleid不能为空');
|
|
|
}
|
|
|
- $info = $list=Db::name("role")->alias("a")->leftJoin("cfp_role_action t","a.id=t.role_id")->field("a.*,t.action_conllect,t.action_data,t.private_data")->where("a.id","=",$roleid)->find();
|
|
|
+ $info = $list=Db::name("role")->alias("a")->leftJoin("role_action t","a.id=t.role_id")->field("a.*,t.action_conllect,t.action_data,t.private_data")->where("a.id","=",$roleid)->find();
|
|
|
if(!$info){
|
|
|
return error_show(1002,"未找到对应的数据");
|
|
|
}
|
|
|
+ $info['item_name'] ='';
|
|
|
+ if($info['item']!=''){
|
|
|
+ $iteminfo = Db::name('company_item')->where('id',"=",$info['item'])->find();
|
|
|
+ $info['item_name'] = isset($iteminfo['name'])? $iteminfo['name']:"";
|
|
|
+ }
|
|
|
$info['action'] =explode(",",$info['action_conllect']);
|
|
|
$info['action_data'] =$info['action_data']!=""?explode(",",$info['action_data']):"";
|
|
|
$info['private_data'] =$info['private_data']!=""?explode(",",$info['private_data']) :"";
|
|
@@ -161,14 +195,7 @@ class Role extends BaseController
|
|
|
*/
|
|
|
public function RoleSave(){
|
|
|
$post =$this->request->post();
|
|
|
- $token = isset($post['token']) ? trim($post['token']) : "";
|
|
|
- if($token==""){
|
|
|
- return error_show(101,'token不能为空');
|
|
|
- }
|
|
|
- $effetc = VerifyTokens($token);
|
|
|
- if(!empty($effetc) && $effetc['code']!=0){
|
|
|
- return error_show($effetc['code'],$effetc['message']);
|
|
|
- }
|
|
|
+
|
|
|
$roleid= isset($post['roleid']) ? intval($post['roleid']) : "";
|
|
|
if($roleid==""){
|
|
|
return error_show(1001,'roleid不能为空');
|
|
@@ -186,10 +213,24 @@ class Role extends BaseController
|
|
|
if($vers){
|
|
|
return error_show(1002,"角色名已存在");
|
|
|
}
|
|
|
- $level = isset($post['level']) ? intval($post['level']) : "";
|
|
|
- if($level==""){
|
|
|
- return error_show(1003,"角色等级不能为空");
|
|
|
+ $role_code= isset($post['role_code'])&&$post['role_code']!=''?trim($post['role_code']) :"";
|
|
|
+ if($role_code==""){
|
|
|
+ return error_show(1002,"参数role_code 不能为空");
|
|
|
+ }
|
|
|
+ $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
|
|
|
+ if($isCode){
|
|
|
+ return error_show(1002,"角色编号已存在");
|
|
|
}
|
|
|
+ $item = isset($post['item']) ? trim($post['item']) : "";
|
|
|
+ if($item==""){
|
|
|
+ return error_show(1003,"参数item 不能为空");
|
|
|
+ }
|
|
|
+ $iteminfo = Db::name('company_item')->where('id',"=",$item)->find();
|
|
|
+ if($iteminfo['is_del']==1){
|
|
|
+ return error_show(1003,"该部门不存在");
|
|
|
+ }
|
|
|
+ $level = isset($post['level']) ? intval($post['level']) : 0;
|
|
|
+ $remark = isset($post['remark']) ? trim($post['remark']) : '';
|
|
|
$action = isset($post['action'])&&is_array($post['action']) ? implode(",",$post['action']) : "";
|
|
|
if($action==""){
|
|
|
return error_show(1004,"功能权限不能为空");
|
|
@@ -204,6 +245,9 @@ class Role extends BaseController
|
|
|
$list = [
|
|
|
"role_name"=>$rolename,
|
|
|
"level"=>$level,
|
|
|
+ 'desc'=>$remark,
|
|
|
+ 'role_code'=>$role_code,
|
|
|
+ 'item'=>$item,
|
|
|
"updatetime"=>date("Y-m-d H:i:s"),
|
|
|
'id'=>$roleid
|
|
|
];
|
|
@@ -241,14 +285,7 @@ class Role extends BaseController
|
|
|
*/
|
|
|
public function RoleStatus(){
|
|
|
$post =$this->request->post();
|
|
|
- $token = isset($post['token']) ? trim($post['token']) : "";
|
|
|
- if($token==""){
|
|
|
- return error_show(101,'token不能为空');
|
|
|
- }
|
|
|
- $effetc = VerifyTokens($token);
|
|
|
- if(!empty($effetc) && $effetc['code']!=0){
|
|
|
- return error_show($effetc['code'],$effetc['message']);
|
|
|
- }
|
|
|
+
|
|
|
$roleid= isset($post['roleid']) ? intval($post['roleid']) : "";
|
|
|
if($roleid==""){
|
|
|
return error_show(1001,'roleid不能为空');
|
|
@@ -291,14 +328,6 @@ class Role extends BaseController
|
|
|
*/
|
|
|
public function RoleAll(){
|
|
|
$post =$this->request->post();
|
|
|
- $token = isset($post['token']) ? trim($post['token']) : "";
|
|
|
- if($token==""){
|
|
|
- return error_show(101,'token不能为空');
|
|
|
- }
|
|
|
- $effetc = VerifyTokens($token);
|
|
|
- if(!empty($effetc) && $effetc['code']!=0){
|
|
|
- return error_show($effetc['code'],$effetc['message']);
|
|
|
- }
|
|
|
$list =Db::name("role")->select();
|
|
|
return app_show(0,"获取成功",$list);
|
|
|
}
|