904118851 1 жил өмнө
parent
commit
e591aecaba

+ 1 - 0
service/agentmgr/init.lua

@@ -735,6 +735,7 @@ s.resp.search_generate_video_file = function(fd,msg_body,user_data)
         search_content = msg_body.search_content,
         page = msg_body.page,
         count = msg_body.count,
+        user_id = msg_body.user_id,
         video_stype = msg_body.video_stype},fd
     )
 end

+ 2 - 2
service/dbmgr/init.lua

@@ -1163,7 +1163,7 @@ end
 s.resp.search_generate_video_file = function(msg_body,fd)
     skynet.fork(function(_fd)
         -- tools.dump(msg_body)
-        local sql = string.format("SELECT * FROM generate_video_list_tab WHERE   video_name LIKE '%%%s%%'  AND is_delete = 0 AND video_stype = %d" ,msg_body.search_content,msg_body.video_stype)
+        local sql = string.format("SELECT * FROM generate_video_list_tab WHERE   video_name LIKE '%%%s%%'  AND is_delete = 0 AND video_stype = %d AND user_id = %d" ,msg_body.search_content,msg_body.video_stype,msg_body.user_id)
         -- skynet.error("sql",sql)
         local res = db:query(sql)
         if res and #res > 0 then
@@ -1772,7 +1772,7 @@ s.resp.share_folder_list = function(msg_body,fd)
                         local _f = list[i]
                         table.insert(file_name_list,i,_f.file_name)
                     end
-                    s.resp.check_file_name_list_is_repeat_by_folder_id({file_name_list=file_name_list,user_id=msg_body.user_id,folder_id=target_folder_id},fd,function(data)
+                    s.resp.check_file_name_list_is_repeat_by_folder_id({file_name_list=file_name_list,user_id=target_user_id,folder_id=target_folder_id},fd,function(data)
                         for i = 1, #data.normal_file_name_list, 1 do
                             local file = getInfoByName(data.normal_file_name_list[i],list)
                             if file~=nil then