Merge branch 'dev_contract' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserAttachmentEntity.java

@@ -41,14 +41,9 @@ public class IcResiUserAttachmentEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     * 项目ID
+     * 用户ID
      */
-	private String projectId;
-
-    /**
-     * 项目进展表ID
-     */
-	private String processId;
+	private String userId;
 
     /**
      * 文件所属内容(内部备注: public 公开答复:internal)

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1746,8 +1746,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             resiUserId = entity.getId();
 
             // 新增用户后保存头像信息
-            formDTO.getImages().forEach(item -> item.setUserId(entity.getId()));
-            formDTO.getImages().forEach(item -> icResiUserAttachmentService.save(item));
+            List<IcResiUserAttachmentDTO> images = formDTO.getImages();
+            images.forEach(item -> item.setUserId(entity.getId()));
+            images.forEach(item -> icResiUserAttachmentService.save(item));
         }
 
         return resiUserId;