作者 lyh

gx

@@ -37,6 +37,15 @@ class BaseLogic extends Logic @@ -37,6 +37,15 @@ class BaseLogic extends Logic
37 */ 37 */
38 public function getParam(){ 38 public function getParam(){
39 $requestAll = $this->request->all(); 39 $requestAll = $this->request->all();
  40 + foreach ($requestAll as $k => $v){
  41 + if(is_array($v)){
  42 + continue;
  43 + }else{
  44 + if(empty($v) && ($v == null)){
  45 + unset($requestAll[$k]);
  46 + }
  47 + }
  48 + }
40 return $this->success($requestAll); 49 return $this->success($requestAll);
41 } 50 }
42 } 51 }
@@ -11,6 +11,7 @@ use App\Models\Manage\JobLevel; @@ -11,6 +11,7 @@ use App\Models\Manage\JobLevel;
11 use App\Models\Manage\Manage; 11 use App\Models\Manage\Manage;
12 use App\Models\Manage\ManageHr; 12 use App\Models\Manage\ManageHr;
13 use App\Models\Manage\Menu; 13 use App\Models\Manage\Menu;
  14 +use Illuminate\Support\Facades\DB;
14 use Illuminate\Support\Facades\Hash; 15 use Illuminate\Support\Facades\Hash;
15 16
16 /** 17 /**
@@ -40,14 +41,18 @@ class HrLogic extends BaseLogic @@ -40,14 +41,18 @@ class HrLogic extends BaseLogic
40 foreach ($this->model::specieField() as $v){ 41 foreach ($this->model::specieField() as $v){
41 $this->param = $this->setJson($v,$this->param); 42 $this->param = $this->setJson($v,$this->param);
42 } 43 }
43 - if(isset($this->param['id']) && !empty($this->param['id'])){  
44 - $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);  
45 - }else{  
46 - //添加管理员账号  
47 - $this->param['manage_id'] = $this->addManager($this->param['mobile'],$this->param['name']);  
48 - $rs = $this->model->add($this->param);  
49 - }  
50 - if($rs === false){ 44 + DB::beginTransaction();
  45 + try {
  46 + if(isset($this->param['id']) && !empty($this->param['id'])){
  47 + $this->model->edit($this->param,['id'=>$this->param['id']]);
  48 + }else{
  49 + //添加管理员账号
  50 + $this->param['manage_id'] = $this->addManager($this->param['mobile'],$this->param['name']);
  51 + $this->model->add($this->param);
  52 + }
  53 + DB::commit();
  54 + }catch (\Exception $e){
  55 + DB::rollBack();
51 $this->fail('系统错误'); 56 $this->fail('系统错误');
52 } 57 }
53 return $this->success(); 58 return $this->success();
@@ -69,6 +69,15 @@ class BaseLogic extends Logic @@ -69,6 +69,15 @@ class BaseLogic extends Logic
69 */ 69 */
70 public function getParam(){ 70 public function getParam(){
71 $requestAll = $this->request->all(); 71 $requestAll = $this->request->all();
  72 + foreach ($requestAll as $k => $v){
  73 + if(is_array($v)){
  74 + continue;
  75 + }else{
  76 + if(empty($v) && ($v == null)){
  77 + unset($requestAll[$k]);
  78 + }
  79 + }
  80 + }
72 return $this->success($requestAll); 81 return $this->success($requestAll);
73 } 82 }
74 83
@@ -36,8 +36,6 @@ class BNav extends Base @@ -36,8 +36,6 @@ class BNav extends Base
36 36
37 37
38 38
39 -  
40 -  
41 /** 39 /**
42 * 是否有下级 40 * 是否有下级
43 * @param int $id 41 * @param int $id
@@ -63,4 +61,15 @@ class BNav extends Base @@ -63,4 +61,15 @@ class BNav extends Base
63 $value = getImageUrl($value); 61 $value = getImageUrl($value);
64 return $value; 62 return $value;
65 } 63 }
  64 +
  65 + /**
  66 + * @remark :
  67 + * @name :addInitParam
  68 + * @author :lyh
  69 + * @method :post
  70 + * @time :2023/9/19 14:04
  71 + */
  72 + public function addInitParam(){
  73 +
  74 + }
66 } 75 }