Merge branch 'dev' of wugg/stock into master

.gitignore

@@ -3,4 +3,7 @@
 /vendor
 *.log
 /config
+composer.lock
+/public/nginx.htaccess
+/config/
 

app/admin/controller/Departuser.php

@@ -13,6 +13,14 @@ class Departuser extends BaseController
     {
         parent::__construct($app);
         $this->post = $this->request->post();
+        $token = isset($this->post['token']) ? trim($this->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']);
+        }
     }
     /*列表*/
     public function list(){
@@ -33,18 +41,25 @@ class Departuser extends BaseController
         }
         /*添加*/
     public function attend(){
+
         $uid = isset($this->post['uid']) && $this->post['uid'] !==""? trim($this->post['uid']):"";
         if($uid==""){
             return error_show(1004,"员工id不能为空");
         }
-        $nickname = isset($this->post['nickname']) && $this->post['nickname'] !==""? trim($this->post['nickname']):"";
-        if($nickname==""){
-            return error_show(1004,"员工名称不能为空");
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+        $to= GetInfoById($token,['id'=>$uid]);
+        if(empty($to)||$to['code']!=0){
+            return app_show(1002,"员工信息不存在");
         }
+        $nickname = isset($to['data']['nickname']) &&$to['data']['nickname']!="" ? $to['data']['nickname'] :"" ;
         $itemid = isset($this->post['itemid']) && $this->post['itemid'] !==""? trim($this->post['itemid']):"";
         if($itemid==""){
             return error_show(1004,"部门不能为空");
         }
+        $repeat_itemid = Db::name("depart_user")->where(["is_del"=>0,"itemid"=>$itemid,"uid"=>$uid])->find();
+        if(!empty($repeat_itemid)){
+            return error_show(1004,"部门用户已存在");
+        }
         $tid = Db::name('company_item')->where(['id'=>$itemid,'is_del'=>0])->find();
         //var_dump( Db::name('company_item')->getLastSql());
         if(empty($tid)){
@@ -71,31 +86,42 @@ class Departuser extends BaseController
     }
     /*编辑*/
     public function useredit(){
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+
         $id = isset($this->post['id']) &&$this->post['id'] !==""? trim($this->post['id']):"";
         if($id ==""){
             return error_show(1004,"id不能为空");
         }
+        $nid = Db::name('depart_user')->where(['id'=>$id,'is_del'=>0])->find();
+        if(empty($nid)){
+            return error_show(1004,"id不能为空");
+        }
         $uid = isset($this->post['uid']) && $this->post['uid'] !==""? trim($this->post['uid']):"";
         if($uid ==""){
             return error_show(1004,"员工id不能为空");
         }
-        $nickname = isset($this->post['nickname']) && $this->post['nickname'] !==""?($this->post)['nickname']: "";
+        $to= GetInfoById($token,['id'=>$uid]);
+       if(empty($to)||$to['code']!=0){
+           return app_show(1002,"员工信息不存在");
+       }
+       $nickname = isset($to['data']['nickname']) &&$to['data']['nickname']!="" ? $to['data']['nickname'] :"" ;
         $itemid = isset($this->post['itemid']) && $this->post['itemid'] !==""?($this->post)['itemid']: "";
         if($itemid==""){
             return error_show(1004,"部门id不能为空");
         }
-        $repeat_itemid = Db::name("depart_user")->where(["is_del"=>0,"itemid"=>$itemid])->where('id','<>',$id)->find();
+        $repeat_itemid = Db::name("depart_user")->where(["is_del"=>0,"itemid"=>$itemid,"uid"=>$uid])->where('id','<>',$id)->find();
         if(!empty($repeat_itemid)){
-            return error_show(1004,"部门id已存在");
+            return error_show(1004,"部门用户已存在");
         }
         try{
             $d=[
-                'uid'=>$uid,'nickname'=>$nickname,'itemid'=>$itemid,
+                'uid'=>$uid,'itemid'=>$itemid,'nickname'=>$nickname,
                 'is_del'=>0,'addtime'=>date("Y-m-d h:i:s"),
                 'updatetime'=>date("Y-m-d h:i:s"),
             ];
-            $r = Db::name("depart_user")->where(["is_del"=>0,"itemid"=>$itemid])->update($d);
-            return  $r ? app_show(0,"信息更新成功"): error_show(1003,"信息更新失败");
+            $r = Db::name("depart_user")->where(["is_del"=>0,"id"=>$id])->save($d);
+           // var_dump( Db::name("depart_user")->getLastSql());
+            return  $r ? app_show(0,"信息更新成功",$to): error_show(1003,"信息更新失败");
         }catch (\Exception $e){
             return error_show(1003,$e->getMessage());
         }

app/admin/controller/Newfill.php

@@ -8,7 +8,7 @@ use think\facade\Db;
 
 class Newfill extends BaseController
 {
-    public $post = "";
+     public $post = "";
 
 
 
@@ -40,7 +40,7 @@ class Newfill extends BaseController
         return app_show(0,"获取成功",array_values($data));
     }
     public function add(){
-        $token = isset($post['token']) ? trim($post['token']) : "";
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
         }
@@ -48,7 +48,6 @@ class Newfill extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return error_show($effetc['code'],$effetc['message']);
         }
-
         $item_name=isset($this->post['name']) && $this->post['name'] !==""? trim($this->post['name']) :"";
         if($item_name==""){
             return error_show(0,"部门名称不能为空");
@@ -96,7 +95,7 @@ class Newfill extends BaseController
         }
     }
     public function refresh(){
-        $token = isset($post['token']) ? trim($post['token']) : "";
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
         }
@@ -144,7 +143,7 @@ class Newfill extends BaseController
       return $re ? app_show(0,"信息更新成功"): error_show(1003,"信息更新失败");
     }
     public function query(){
-        $token = isset($post['token']) ? trim($post['token']) : "";
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
         }
@@ -165,7 +164,7 @@ class Newfill extends BaseController
     }
 
     public function itemdel(){
-        $token = isset($post['token']) ? trim($post['token']) : "";
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
         }

app/common.php

@@ -150,13 +150,17 @@ function GetList($token,$condition){
 
     return json_decode($response,true);
 }
+
+/**
+ * @param $token
+ * @param $condition ['id'=>1]
+ * @return mixed
+ */
 function GetInfoById($token,$condition){
     $host = Config::get("app");
-
     $url = $host["api_host"]."/Api/userinfobyid";
     $condition['token']=$token;
     $response=curl_request($url,$condition);
-
     return json_decode($response,true);
 }
 

config/app.php

@@ -1,33 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | 应用设置
-// +----------------------------------------------------------------------
-
-return [
-    // 应用地址
-    'app_host'         => env('app.host', ''),
-    // 应用的命名空间
-    'app_namespace'    => '',
-    // 是否启用路由
-    'with_route'       => true,
-    // 默认应用
-    'default_app'      => 'index',
-    // 默认时区
-    'default_timezone' => 'Asia/Shanghai',
-
-    // 应用映射（自动多应用模式有效）
-    'app_map'          => [],
-    // 域名绑定（自动多应用模式有效）
-    'domain_bind'      => [],
-    // 禁止URL访问的应用列表（自动多应用模式有效）
-    'deny_app_list'    => [],
-
-    // 异常页面的模板文件
-    'exception_tmpl'   => app()->getThinkPath() . 'tpl/think_exception.tpl',
-
-    // 错误显示信息,非调试模式有效
-    'error_message'    => '页面错误！请稍后再试～',
-    // 显示错误信息
-    'show_error_msg'   => false,
-    "api_host"=>"http://www.invoice.com"
-];