浏览代码

로그인한 사용자가 저장한 사진만 보이도록 수정

서용하 6 年之前
父节点
当前提交
fe0676674b
共有 2 个文件被更改,包括 17 次插入8 次删除
  1. 13 3
      MCPlus/Model/Photo.swift
  2. 4 5
      MCPlus/ViewControllers/PhotoViewController.swift

+ 13 - 3
MCPlus/Model/Photo.swift

@@ -189,7 +189,9 @@ extension Photo{
                 photo.file = result?.string(forColumn: "fileName")
                 photo.key = result?.string(forColumn: "fileKey")
                 if photo.recovery(){
-                    photos.append(photo)
+                    if self.filter(photo, user){
+                        photos.append(photo)
+                    }
                 }
             }
             let keys = photos.map({$0.key}).compactMap({$0}).reversed()
@@ -204,7 +206,7 @@ extension Photo{
         return returnDic
     }
     
-    static func allList() -> [String:[Photo]]{
+    static func allList(user:User) -> [String:[Photo]]{
         var returnDic:[String:[Photo]]
         let contactDB = SqlClient.shared.DB
         returnDic = [String:[Photo]]()
@@ -226,7 +228,9 @@ extension Photo{
                 photo.key = result?.string(forColumn: "fileKey")
                 
                 if photo.recovery(){
-                    photos.append(photo)
+                    if self.filter(photo, user){
+                        photos.append(photo)
+                    }
                 }
             }
             let keys = photos.map({$0.key}).compactMap({$0}).reversed()
@@ -240,6 +244,12 @@ extension Photo{
         return returnDic
     }
     
+    static func filter(_ photo:Photo, _ user:User) -> Bool {
+        if photo.user?.userId != user.userId{
+            return false
+        }
+        return true
+    }
     
 }
 

+ 4 - 5
MCPlus/ViewControllers/PhotoViewController.swift

@@ -241,13 +241,12 @@ extension PhotoViewController{
     
     //테이블 리로드 rx swift 이용
     func reloadTable(){
+        guard let parent = self.parent as? PictureViewController else{ return }
+        guard let user = parent.user else{ return }
         if self.allUserAlbumLabel.text == "전체환자"{
-            if let parent = self.parent as? PictureViewController, let user = parent.user{
-                self.list.value = Photo.list(user: user)
-            }
-            
+            self.list.value = Photo.list(user: user)
         }else{
-            self.list.value = Photo.allList()
+            self.list.value = Photo.allList(user: user)
         }
     }