|
@@ -26,12 +26,11 @@ class Role extends Base
|
|
|
*/
|
|
|
public function roleList()
|
|
|
{
|
|
|
- $post = $this->request->only(["status" => "", "role_name" => "", "relaComNo" => "", "companyName" => "", "companyNo" => "", "level" => "","page" => 1, "size" => 10], "post", "trim");
|
|
|
+ $post = $this->request->only(["status" => "", "role_name" => "", "relaComNo" => "", "companyName" => "", "companyNo" => "", "page" => 1, "size" => 10], "post", "trim");
|
|
|
$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['relaComNo']) && $post['relaComNo'] !== "" ? $condition[] = ["a.companyNo", "=", $post['relaComNo']] : "";
|
|
|
isset($post['companyNo']) && $post['companyNo'] !== "" ? $condition[] = ["a.companyNo", "=", $post['companyNo']] : "";
|
|
|
isset($post['companyName']) && $post['companyName'] !== "" ? $condition[] = ["b.name", "like", "%{$post['companyName']}%"] : "";
|
|
@@ -188,13 +187,12 @@ class Role extends Base
|
|
|
*/
|
|
|
public function roleSave()
|
|
|
{
|
|
|
- $post = $this->request->only(["roleid" => "", "role_name" => "", "level" => "", "relaComNo" => "", "companyNo" => "", "action" => "", "action_data" => "", "private_data" => "",'is_allow_see_price','private_field'], "post");
|
|
|
+ $post = $this->request->only(["roleid" => "", "role_name" => "", "relaComNo" => "", "companyNo" => "", "action" => "", "action_data" => "", "private_data" => "",'is_allow_see_price','private_field'], "post");
|
|
|
$valid = Validate::rule([
|
|
|
"role_name|角色名称" => "require|max:255|min:2",
|
|
|
"relaComNo|业务公司编号" => "max:255",
|
|
|
"companyNo|业务公司编号" => "max:255",
|
|
|
"action|角色权限" => "require|array",
|
|
|
- "level|角色级别" => "require|in:1,2,3",
|
|
|
"is_allow_see_price|是否允许查看价格" => "require|in:0,1",
|
|
|
'private_field|关键字段权限'=>'require|array|max:3'
|
|
|
]);
|
|
@@ -202,7 +200,7 @@ class Role extends Base
|
|
|
$info = Db::name("role")->where("id", "=", $post['roleid'])->find();
|
|
|
if (!$info) return error_show(1002, "未找到对应的数据");
|
|
|
|
|
|
- if ($post['relaComNo'] != "" && $info["level"] == 1) return error_show(1002, "超管权限角色不可关联业务公司");
|
|
|
+// if ($post['relaComNo'] != "" && $info["level"] == 1) return error_show(1002, "超管权限角色不可关联业务公司");
|
|
|
|
|
|
// if($this->level==1){
|
|
|
// $companyNo =$post['companyNo']??"";
|
|
@@ -222,7 +220,6 @@ class Role extends Base
|
|
|
try {
|
|
|
$list = [
|
|
|
"role_name" => $post['role_name'],
|
|
|
- "level" => $post['level'],
|
|
|
"updatetime" => date("Y-m-d H:i:s"),
|
|
|
'id' => $post['roleid'],
|
|
|
'is_allow_see_price' => $post['is_allow_see_price']
|