shjung 3 rokov pred
rodič
commit
194c56e68e

+ 12 - 14
src/main/java/com/its/op/service/its/oper/TbMsWebMemberService.java

@@ -65,20 +65,7 @@ public class TbMsWebMemberService {
     public List<TbMsWebMemberDto> mergeInfoList(List<TbMsWebMemberDto.TbMsWebMemberUpdReq> reqList) {
         List<TbMsWebMemberDto> result = new ArrayList<>();
         for (TbMsWebMemberDto.TbMsWebMemberUpdReq req : reqList) {
-            TbMsWebMember entity = null;
-            try {
-                entity = requireOne(req.getEmail());
-            }
-            catch(NoSuchElementException e_notfound) {
-                entity = null;
-            }
-
-            TbMsWebMember obj = req.toEntity();
-            if (entity != null) {
-                obj.setPassword(entity.getPassword());
-            }
-            this.repo.save(obj);
-            result.add(obj.toDto());
+            result.add(mergeInfo(req));
         }
         return result;
     }
@@ -87,6 +74,17 @@ public class TbMsWebMemberService {
     @Transactional
     public TbMsWebMemberDto mergeInfo(TbMsWebMemberDto.TbMsWebMemberUpdReq req) {
         TbMsWebMember obj = req.toEntity();
+        TbMsWebMember entity = null;
+        try {
+            entity = requireOne(req.getEmail());
+        }
+        catch(NoSuchElementException e_notfound) {
+            entity = null;
+        }
+
+        if (entity != null) {
+            obj.setPassword(entity.getPassword());
+        }
         this.repo.save(obj);
         return obj.toDto();
     }