Merge branch 'plm' of wugg/stock into master

app/admin/controller/Departuser.php

@@ -142,7 +142,7 @@ class Departuser extends BaseController
             return error_show(1004,'员工不能为空');
         }
 
-        $fo = Db::name('depart_user')->alias('a')->join('company_item b',"b.id=a.uid",'left')
+        $fo = Db::name('depart_user')->alias('a')->join('company_item b',"b.id=a.id",'left')
             ->field('a.uid,a.itemid,a.nickname,b.name')->where(['uid'=>$id,'a.is_del'=>0,'b.is_del'=>0])->find();
        // var_dump( Db::name('depart_user')->getLastSql());
         if(empty($fo)){

app/admin/controller/Newfill.php

@@ -84,6 +84,7 @@ class Newfill extends BaseController
     }
     /*职位*/
     public function userp(){
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
         $id = isset($this->post['id'])?intval($this->post['id']):"";
         if($id==""){
             return error_show(1004,"参数id不能为空");
@@ -105,9 +106,7 @@ class Newfill extends BaseController
                 $m= Db::name('depart_user')->save($f);
                 $orde = ["order_code"=>$t['nickname'],"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
                 ActionLog::logAdd($this->post['token'],$orde,"depart_user",0,$orde);
-                 if($m==true){
-                     Db::commit();
-                 }else{
+                 if($m==false){
                      Db::rollback();
                      return error_show(1004,"负责人修改失败");
                  }
@@ -119,11 +118,11 @@ class Newfill extends BaseController
         $ti = Db::name('depart_user')->save($t);
         if($ti==true){
             Db::commit();
+            return app_show(0,"修改成功");
         }else{
             Db::rollback();
             return error_show(1004,"修改失败");
         }
-        return app_show(0,"修改成功");
     }
     public function add(){
         $token = isset($this->post['token']) ? trim($this->post['token']) : "";