用户组优化

app/admin/controller/DataGroup.php

@@ -153,12 +153,11 @@ class DataGroup extends Base
         Db::startTrans();
         try {
 
-            $res = DataGroupModel::field('id')
+            $res = DataGroupModel::field('id,status')
                 ->where(['id' => $param['id'], 'is_del' => DataGroupModel::$delete_正常])
-                ->findOrEmpty()
-                ->isEmpty();
+                ->findOrEmpty();
 
-            if ($res) throw new Exception('该记录不存在');
+            if ($res->isEmpty()) throw new Exception('该记录不存在');
 
             $param['updatetime'] = date('Y-m-d H:i:s');
             DataGroupModel::where(['id' => $param['id'], 'is_del' => DataGroupModel::$delete_正常])->strict(false)->save($param);
@@ -173,7 +172,7 @@ class DataGroup extends Base
                     'data_group_id' => $param['id'],
                     'uid' => $uid['uid'],
                     'is_del' => DataGroupModel::$delete_正常,
-                    'status' => DataGroupModel::$status_启用,
+                    'status' => $res->status,
                     'addtime' => date('Y-m-d H:i:s'),
                     'updatetime' => date('Y-m-d H:i:s'),
                 ];
@@ -190,7 +189,7 @@ class DataGroup extends Base
             return app_show(0, '修改用户组成功');
         } catch (Exception $exception) {
             Db::rollback();
-            return error_show(1005, '修改用户组失败');
+            return error_show(1005, '修改用户组失败,' . $exception->getMessage());
         }
 
     }
@@ -263,7 +262,7 @@ class DataGroup extends Base
             return app_show(0, $status[$param['status']] . '用户组成功');
         } catch (Exception $exception) {
             Db::rollback();
-            return error_show(1005, $status[$param['status']] . '用户组成功');
+            return error_show(1005, $status[$param['status']] . '用户组失败');
         }
 
     }