细节优化

app/admin/controller/DataGroup.php

@@ -20,7 +20,7 @@ class DataGroup extends Base
 
         $rs = $db
             ->alias('a')
-            ->leftJoin('data_group_userid b', 'b.data_group_id=a.id AND b.is_del=' . DataGroupModel::$delete_正常)
+            ->leftJoin('data_group_userid b', 'b.data_group_id=a.id AND b.is_del=' . DataGroupModel::$delete_正常 . ' AND b.status=' . DataGroupModel::$status_启用)
             ->leftJoin('depart_user u', 'u.uid=b.uid AND u.is_del=0')
             ->group('a.id')
             ->where('a.is_del', DataGroupModel::$delete_正常);
@@ -81,6 +81,8 @@ class DataGroup extends Base
                 'status' => DataGroupModel::$status_启用,
                 'createrid' => $this->uid,
                 'creater' => $this->uname,
+                'addtime' => date('Y-m-d H:i:s'),
+                'updatetime' => date('Y-m-d H:i:s'),
             ]);
 
             //用户组-用户集合
@@ -158,6 +160,7 @@ class DataGroup extends Base
 
             if ($res) 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);
 
             //用户组-用户集合
@@ -171,13 +174,15 @@ class DataGroup extends Base
                     'uid' => $uid['uid'],
                     'is_del' => DataGroupModel::$delete_正常,
                     'status' => DataGroupModel::$status_启用,
+                    'addtime' => date('Y-m-d H:i:s'),
+                    'updatetime' => date('Y-m-d H:i:s'),
                 ];
 
             }
             if ($delete_data) Db::name('data_group_userid')
                 ->whereIn('id', $delete_data)
                 ->where(['is_del' => DataGroupModel::$delete_正常, 'data_group_id' => $param['id']])
-                ->update(['is_del' => DataGroupModel::$delete_删除]);
+                ->update(['is_del' => DataGroupModel::$delete_删除, 'updatetime' => date('Y-m-d H:i:s')]);
 
             if ($insert_data) Db::name('data_group_userid')->insertAll($insert_data);
 
@@ -206,12 +211,12 @@ class DataGroup extends Base
             Db::name('data_group')
                 ->whereIn('id', $param['id'])
                 ->where(['is_del' => DataGroupModel::$delete_正常])
-                ->update(['is_del' => DataGroupModel::$delete_删除]);
+                ->update(['is_del' => DataGroupModel::$delete_删除, 'updatetime' => date('Y-m-d H:i:s')]);
 
             Db::name('data_group_userid')
                 ->whereIn('data_group_id', $param['id'])
                 ->where('is_del', DataGroupModel::$delete_正常)
-                ->update(['is_del' => DataGroupModel::$delete_删除]);
+                ->update(['is_del' => DataGroupModel::$delete_删除, 'updatetime' => date('Y-m-d H:i:s')]);
 
             Db::commit();
             return app_show(0, '删除用户组成功');
@@ -245,14 +250,14 @@ class DataGroup extends Base
                     ['id', 'in', $param['id']],
                     ['is_del', '=', DataGroupModel::$delete_正常],
                     ['status', '<>', $param['status']],
-                ])->update(['status' => $param['status']]);
+                ])->update(['status' => $param['status'], 'updatetime' => date('Y-m-d H:i:s')]);
 
             Db::name('data_group_userid')
                 ->where([
                     ['data_group_id', 'in', $param['id']],
                     ['is_del', '=', DataGroupModel::$delete_正常],
                     ['status', '<>', $param['status']],
-                ])->update(['status' => $param['status']]);
+                ])->update(['status' => $param['status'], 'updatetime' => date('Y-m-d H:i:s')]);
 
             Db::commit();
             return app_show(0, $status[$param['status']] . '用户组成功');

app/admin/controller/DataShare.php

@@ -98,6 +98,8 @@ class DataShare extends Base
             'status' => DataShareModel::$status_启用,
             'createrid' => $this->uid,
             'creater' => $this->uname,
+            'addtime' => date('Y-m-d H:i:s'),
+            'updatetime' => date('Y-m-d H:i:s'),
         ])->save();
 
         return $rs ? app_show(0, '新建共享规则成功') : error_show(1004, '新建共享规则失败');
@@ -161,6 +163,8 @@ class DataShare extends Base
 
         if (isset($param['menu_ids']) && is_array($param['menu_ids'])) $param['menu_ids'] = implode(',', $param['menu_ids']);
 
+        $param['updatetime'] = date('Y-m-d H:i:s');
+
         $rs = DataShareModel::where(['id' => $param['id'], 'is_del' => DataShareModel::$delete_正常])->strict(false)->save($param);
 
         return $rs ? app_show(0, '修改共享规则成功') : error_show(1005, '修改共享规则失败');
@@ -179,7 +183,7 @@ class DataShare extends Base
 
         $rs = DataShareModel::whereIn('id', $param['id'])
             ->where(['is_del' => DataShareModel::$delete_正常])
-            ->update(['is_del' => DataShareModel::$delete_删除]);
+            ->update(['is_del' => DataShareModel::$delete_删除, 'updatetime' => date('Y-m-d H:i:s')]);
 
         return $rs ? app_show(0, '删除共享规则成功') : error_show(1005, '删除共享规则失败');
 
@@ -204,7 +208,7 @@ class DataShare extends Base
             ['id', 'in', $param['id']],
             ['is_del', '=', DataShareModel::$delete_正常],
             ['status', '<>', $param['status']],
-        ])->update(['status' => $param['status']]);
+        ])->update(['status' => $param['status'], 'updatetime' => date('Y-m-d H:i:s')]);
 
         return $rs ? app_show(0, $status[$param['status']] . '共享规则成功') : error_show(1005, $status[$param['status']] . '共享规则失败');