Merge branch 'bug_fix_1212_liu'

app/JsonRpc/UserService.php

@@ -351,8 +351,9 @@ class UserService implements UserServiceInterface
      */
     public function addRole(array $data) :array
     {
-        Db::beginTransaction();
+//        Db::beginTransaction();
         try{
+            $data['sort'] = intval($data['sort'])??0;
             Role::insertGetId($data);
             $logData = [
                 'user_id'=>$data['user_id'],
@@ -360,9 +361,9 @@ class UserService implements UserServiceInterface
                 'type'=>1
             ];
             RoleLog::insertGetId($logData);
-            Db::commit();
+//            Db::commit();
         } catch(\Throwable $ex){
-            Db::rollBack();
+//            Db::rollBack();
             return Result::error("新增失败",0);
         }
         return Result::success([]);

runtime/hyperf.pid

@@ -1 +0,0 @@
-10484

runtime/logs/hyperf.log

@@ -63,3 +63,27 @@
 [2024-12-20 03:18:45] sql.INFO: [45.31] select `user`.`id`, `user`.`admin_id`, `user`.`user_name`, `user_info`.`real_name`, `user`.`mobile`, `user`.`type_id`, `user`.`created_at`, `user`.`status`, `user_infoA`.`real_name` as `admin_real_name`, `role`.`role_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` left join `user_info` as `user_infoA` on `user`.`admin_id` = `user_infoA`.`user_id` left join `role_user` on `role_user`.`user_id` = `user`.`id` left join `role` on `role`.`id` = `role_user`.`role_id` order by `user`.`id` desc limit 10 offset 0 [] []
 [2024-12-20 03:19:00] sql.INFO: [30288.49] select count(*) as aggregate from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` left join `user_info` as `user_infoA` on `user`.`admin_id` = `user_infoA`.`user_id` left join `role_user` on `role_user`.`user_id` = `user`.`id` left join `role` on `role`.`id` = `role_user`.`role_id` [] []
 [2024-12-20 03:19:00] sql.INFO: [19.01] select `user`.`id`, `user`.`admin_id`, `user`.`user_name`, `user_info`.`real_name`, `user`.`mobile`, `user`.`type_id`, `user`.`created_at`, `user`.`status`, `user_infoA`.`real_name` as `admin_real_name`, `role`.`role_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` left join `user_info` as `user_infoA` on `user`.`admin_id` = `user_infoA`.`user_id` left join `role_user` on `role_user`.`user_id` = `user`.`id` left join `role` on `role`.`id` = `role_user`.`role_id` order by `user`.`id` desc limit 10 offset 0 [] []
+[2025-01-13 03:14:21] sql.INFO: [52.96] select * from `user` where (`user_name` = '18400641393') limit 1 [] []
+[2025-01-13 03:14:22] sql.INFO: [13.8] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`real_name`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`city_id`, `user_info`.`business_name`, `user_info`.`job`, `user_info`.`number`, `user_info`.`city_arr_id`, `user_info`.`from_time`, `user_info`.`to_time`, `user_info`.`long_time`, `user_info`.`native_place_id`, `user_info`.`native_place_arr_id`, `user_info`.`qq`, `user_info`.`zip_code`, `user_info`.`address_arr_id`, `user_info`.`address_id`, `user_info`.`address`, `user_info`.`other`, `user_info`.`remark`, `user_info`.`fax`, `user_info`.`position`, `user_info`.`legal_person_real_name`, `user_info`.`legal_person_mobile`, `user_info`.`legal_person_id_card`, `user_info`.`administrative_unit_arr_id`, `user_info`.`administrative_unit_id`, `role_user`.`role_id` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` left join `role_user` on `role_user`.`user_id` = `user`.`id` where `user`.`id` = '86' limit 1 [] []
+[2025-01-13 03:14:22] sql.INFO: [11.51] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '86') limit 1 [] []
+[2025-01-13 03:14:22] sql.INFO: [13.4] select * from `menu` where `id` in ('77', '78', '79', '80', '120', '83', '84', '85', '86', '89', '88', '96', '112', '122', '123', '124', '93', '94', '95', '99', '103', '114', '101', '102', '107', '108', '110', '119', '121', '116', '117', '118') [] []
+[2025-01-13 07:00:00] sql.INFO: [237.56] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '1', '73') [] []
+[2025-01-13 07:00:00] sql.INFO: [15.35] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":"1","user_id":73}', '1') [] []
+[2025-01-13 07:00:27] sql.INFO: [462.43] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '11', '73') [] []
+[2025-01-13 07:00:27] sql.INFO: [16.24] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":"11","user_id":73}', '1') [] []
+[2025-01-13 07:01:19] sql.INFO: [17.32] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '-1', '73') [] []
+[2025-01-13 07:01:19] sql.INFO: [15.74] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":"-1","user_id":73}', '1') [] []
+[2025-01-13 07:02:10] sql.INFO: [18.44] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '-1', '73') [] []
+[2025-01-13 07:02:10] sql.INFO: [16.11] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":"-1","user_id":73}', '1') [] []
+[2025-01-13 07:02:12] sql.INFO: [16.87] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '-1', '73') [] []
+[2025-01-13 07:02:12] sql.INFO: [16.37] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":"-1","user_id":73}', '1') [] []
+[2025-01-13 07:12:41] sql.INFO: [18.72] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '-1', '73') [] []
+[2025-01-13 07:12:41] sql.INFO: [16.63] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":"-1","user_id":73}', '1') [] []
+[2025-01-13 09:20:15] sql.INFO: [59.26] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '0', '73') [] []
+[2025-01-13 09:20:16] sql.INFO: [17.27] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":0,"user_id":73}', '1') [] []
+[2025-01-13 09:27:20] sql.INFO: [62.39] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '11', '73') [] []
+[2025-01-13 09:27:20] sql.INFO: [13.4] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":11,"user_id":73}', '1') [] []
+[2025-01-13 09:27:29] sql.INFO: [17.75] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '-1', '73') [] []
+[2025-01-13 09:27:29] sql.INFO: [15.95] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":-1,"user_id":73}', '1') [] []
+[2025-01-13 09:28:06] sql.INFO: [17.1] insert into `role` (`role_name`, `rule`, `remark`, `sort`, `user_id`) values ('角色名称', '["1","2"]', '备注信息1', '0', '73') [] []
+[2025-01-13 09:28:06] sql.INFO: [16.17] insert into `role_log` (`user_id`, `data`, `type`) values ('73', '{"role_name":"\u89d2\u8272\u540d\u79f0","rule":"[\"1\",\"2\"]","remark":"\u5907\u6ce8\u4fe1\u606f1","sort":0,"user_id":73}', '1') [] []