Merge branch 'developer_bw' of…

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java

@@ -1398,8 +1398,9 @@ public class CommonServiceImpl {
             double totalNum = (double) (totalSize/1024/1024);
            if (totalNum > 500 ){
                this.cleanup(folderPath);
-               response.setHeader("content-error","所选文件总大小不得超过500M,当前所选文件总大小为"+totalNum+"M");
-               return;
+               response.setHeader("content-error", URLEncoder.encode("所选文件总大小不得超过500M,当前所选文件总大小为"+totalNum+"M", "UTF-8"));
+               response.setContentType("text/plain");
+               throw new BadRequest("所选文件总大小不得超过500M,当前所选文件总大小为"+totalNum+"M");
            }
      //       response.setContentLengthLong((int) totalSize);
             addFolderToZip(zipFilePath, folderPath, zos,response);