Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectAccessory/web/CollectAccessoryController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -158,7 +159,11 @@ public class CollectAccessoryController extends BaseController {
             collectAccessoryInfo.setUrl(collectAccessoryInfo.getUrl().replace(aliyunUrl,""));
         }
         //根据文件id查询文件信息
-        Workattachment workattachment = workattachmentService.getByUrl(collectAccessoryInfo.getUrl());
+        List<Workattachment> workattachments = workattachmentService.getByUrls(collectAccessoryInfo.getUrl());
+        Workattachment workattachment=null;
+        if (workattachments.size()>0){
+            workattachment=workattachments.get(0);
+        }
         if(null != workattachment){
             collectAccessoryInfo.setFileName(workattachment.getAttachmentName());
         }

src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryController.java

@@ -484,7 +484,11 @@ public class ProjectAccessoryController extends BaseController {
 			collectAccessoryInfo.setUrl(collectAccessoryInfo.getUrl().replace(aliyunUrl,""));
 		}
 		//根据文件id查询文件信息
-		Workattachment workattachment = workattachmentService.getByUrl(collectAccessoryInfo.getUrl());
+		List<Workattachment> workattachments = workattachmentService.getByUrls(collectAccessoryInfo.getUrl());
+		Workattachment workattachment=null;
+		if (workattachments.size()>0){
+			workattachment=workattachments.get(0);
+		}
 		if(null != workattachment){
 			collectAccessoryInfo.setFileName(workattachment.getAttachmentName());
 		}

src/main/java/com/jeeplus/modules/sys/dao/WorkattachmentDao.java

@@ -24,6 +24,7 @@ public interface WorkattachmentDao extends CrudDao<Workattachment> {
     //根据相同的url删除附件
     int deleteByUrl(Workattachment workattachment);
     Workattachment getByUrl(@Param("url") String url);
+    List<Workattachment> getByUrls(@Param("url") String url);
 
     //根据相同的attachment_id
     List<String> getAttachmentIds(String attachmentId);

src/main/java/com/jeeplus/modules/sys/service/WorkattachmentService.java

@@ -583,6 +583,14 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	public Workattachment getByUrl(String url) {
 		return dao.getByUrl(url);
 	}
+	/**
+	 * 根据存储路径查询文件信息
+	 * @param url
+	 * @return
+	 */
+	public List<Workattachment> getByUrls(String url) {
+		return dao.getByUrls(url);
+	}
 
 
 	/**

src/main/resources/mappings/modules/sys/WorkattachmentDao.xml

@@ -96,6 +96,14 @@
 		<include refid="workattachmentJoins"/>
 		WHERE a.url = #{url}
 	</select>
+	<select id="getByUrls" resultType="com.jeeplus.modules.sys.entity.Workattachment">
+		SELECT
+		<include refid="workattachmentColumns"/>
+		FROM work_attachment a
+		<include refid="workattachmentJoins"/>
+		WHERE a.url = #{url}
+	</select>
+
 
 	<update id="updateAttachmentId">
 		UPDATE work_attachment a