|
@@ -48,6 +48,9 @@ class TagHistory extends CatchController
|
|
|
$nonghu = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 7)->find();
|
|
|
//cs店
|
|
|
$cs_store = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 8)->find();
|
|
|
+ //公司测试猪耳标
|
|
|
+ $companyPigEarTest = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 9)->find();
|
|
|
+
|
|
|
|
|
|
|
|
|
if (!empty($time)) {
|
|
@@ -111,6 +114,9 @@ class TagHistory extends CatchController
|
|
|
} else if ($cs_store) {
|
|
|
$where[] = ['mac', 'in', '30B5F1013238,30B5F10138EB'];
|
|
|
$where[] = ['lable', 'in', "000080000001,000080000002,0000F6000003,0000F6000004,0000F6000005"];
|
|
|
+ }elseif($companyPigEarTest){
|
|
|
+ $where[] = ['mac', 'in', '301054541054'];
|
|
|
+ $where[] = ['lable', 'in', "00000098C145"];
|
|
|
}
|
|
|
|
|
|
|
|
@@ -241,6 +247,7 @@ class TagHistory extends CatchController
|
|
|
$nonghu = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 7)->find();
|
|
|
//cs店
|
|
|
$cs_store = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 8)->find();
|
|
|
+ $companyPigEarTest = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 9)->find();
|
|
|
$mac = null;
|
|
|
if ($bool) {
|
|
|
$mac = '30B5F1013899';
|
|
@@ -256,6 +263,8 @@ class TagHistory extends CatchController
|
|
|
$mac = '30B5F10138BA';
|
|
|
} elseif ($cs_store) {
|
|
|
$mac = '30B5F1013238,30B5F10138EB';
|
|
|
+ }else if($companyPigEarTest){
|
|
|
+ $mac = '301054541054';
|
|
|
}
|
|
|
$list = explode(',', $mac);
|
|
|
return CatchResponse::success($list);
|
|
@@ -281,6 +290,7 @@ class TagHistory extends CatchController
|
|
|
$nonghu = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 7)->find();
|
|
|
//测试cs店
|
|
|
$cs_store = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 8)->find();
|
|
|
+ $companyPigEarTest = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 9)->find();
|
|
|
$lable = null;
|
|
|
|
|
|
if ($bool) {
|
|
@@ -297,6 +307,8 @@ class TagHistory extends CatchController
|
|
|
$lable = "87011111CFC1,8702222CFC1,8702222CFC1";
|
|
|
} else if ($cs_store) {
|
|
|
$lable = "000080000001,000080000002,0000F6000003,0000F6000004,0000F6000005";
|
|
|
+ }elseif($companyPigEarTest){
|
|
|
+ $lable ="00000098C145";
|
|
|
}
|
|
|
$list = explode(',', $lable);
|
|
|
|