edit

app/Http/Controllers/Api/SystemsManage/EmployeeListController.php

@@ -420,7 +420,20 @@ class EmployeeListController extends Controller
             ->where('adm_id', $request['adm_id'])
             ->where('shop_id', $user_info->adm_shop_id)
             ->update($updateAdminShopRoleData);
-        if ($adm_res && $updateAdminShopRoleDataRes) {
+        $find_user_info = DB::table('login_wechat_applet')->where('adm_id',$request['adm_id'])->first();
+        if($find_user_info){
+            $find_user_info = DB::table('login_wechat_applet')->where('adm_id',$request['adm_id'])->delete();
+        }else{
+            $find_user_info = true;
+        }
+        $find_user_infos = DB::table('login_temporary')->where('adm_id',$request['adm_id'])->first();
+        if($find_user_infos){
+            $find_user_infos = DB::table('login_temporary')->where('adm_id',$request['adm_id'])->delete();
+        }else{
+            $find_user_infos = true;
+        }
+
+        if ($adm_res && $updateAdminShopRoleDataRes && $find_user_info && $find_user_infos) {
             Common::addLog($user_info, getRealIp($request), '员工列表', '编辑', '编辑员工：' . $request['adm_name'] . '('.$user_info->adm_shop_id.')' . '成功');
             DB::commit();
             return response()->json(['code' => 200, 'msg' => 'success', 'data' => '编辑员工成功']);

app/Services/Business/WashOrderService.php

@@ -11679,6 +11679,7 @@ class WashOrderService extends Service
                     ->first();
                 if ($value->wor_delete == 1) {
                     $request['wor_id'] = $value->wor_id;
+                    $request['remark'] = "取消审核通过";
                     $return_data = $work_order->deletes($user_info, $request, $find_work1);
                     if ($return_data['code'] != 200) {
                         return $return_data;