Merge branch 'master-dev' of wugg/cxinv into master

app/admin/controller/User.php

@@ -490,6 +490,7 @@ class User extends BaseController{
 	    	->where($where)
 	    	->field("a.uid,a.nickname,roleid,companyNo,b.name as companyName,a.status,a.company_type")
 	    	->page($page,intval($post['size']))
+	    	->order("a.is_main desc")
 	    	->select()->toArray();
 	    	foreach ($list as &$value){
 	    		$value['role_name'] = Db::name("role")->where(["id"=>$value["roleid"]])->value("role_name","");

app/command/handleCxData.php

@@ -29,11 +29,12 @@ class handleCxData extends command
 
 		Db::startTrans();
         $result = Db::name('caixiao_data')
-            ->json(["data"])
+//            ->json(["data"])
+            ->withAttr("data",function ($v){return json_decode(str_replace(array("\r\n", "\r", "\n"), '', $v),true);})
             ->where("status",1)
+            ->where("addtime",">=",date("Y-m-d H:i:s",strtotime(time()-1800)))
             ->lock(true)
             ->findOrEmpty();
-
         if ($result) {
             try {
             	$data = $result['data']??[];