oa

Makefile

@@ -2,7 +2,7 @@ merge:
 	git checkout master;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v1.3.9;git push origin --tags;git checkout dev;
+	git checkout master;git tag v1.4.0;git push origin --tags;git checkout dev;
 
 remove-tag:
 	git tag -d v1.2.0;git push origin :refs/tags/v1.1.8;

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -232,7 +232,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                 new MPJLambdaWrapper<NewsAppendix>().eq(NewsAppendix::getNewsId, id)
                         .select(NewsRelation::getId)
                         .select(NewsAppendix.class, x -> VoToColumnUtil.fieldsToColumns(NewsAppendixVo.class).contains(x.getProperty()))
-                        .leftJoin(File.class, File::getId, NewsAppendix::getFileId, ext -> ext.selectAs(File::getFileName, NewsAppendixVo::getFileName)
+                        .leftJoin(File.class, File::getFolderId, NewsAppendix::getFileId, ext -> ext.selectAs(File::getFileName, NewsAppendixVo::getFileName)
                                 .selectAs(File::getFolderId, NewsAppendixVo::getFolderId)
                                 .selectAs(File::getFileUrl, NewsAppendixVo::getFileUrl))
         );
@@ -846,7 +846,8 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                         JSONObject data = new JSONObject();
 
                         JSONObject data1 = new JSONObject();
-                        data1.put("value", news.getFullHead());
+                        String hValue = news.getFullHead().replace("“", "").replace("”", "").replace("\"", "").replace("\n", "").replace("\r", "").replace("\t", "");
+                        data1.put("value", hValue);
                         data.put("thing23", data1);
 
                         JSONObject data2 = new JSONObject();

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8

src/test/java/com/xjrsoft/xjrsoftboot/StrTest.java

@@ -21,14 +21,14 @@ public class StrTest {
     public void formatTest() {
         String f = "《{}》等待{}审批。";
 
-        System.out.println(StrUtil.format(f, "sdfsdf","bbbbbb"));
+        System.out.println(StrUtil.format(f, "sdfsdf", "bbbbbb"));
     }
 
     @Test
     public void arrayTest() {
         String f = "《{}》等待{}审批。";
 
-        System.out.println(StrUtil.format(f, "sdfsdf","bbbbbb"));
+        System.out.println(StrUtil.format(f, "sdfsdf", "bbbbbb"));
     }
 
     @Test
@@ -168,8 +168,15 @@ public class StrTest {
     }
 
     @Test
-    void test22(){
+    void test22() {
         String name = "2023年秋季";
         System.out.println(name.contains("秋季"));
     }
+
+    @Test
+    public void StringTest() {
+        String str = "电子“1+x”集成电路检测技术应用（初级）考试";
+        str = str.replace("“", "").replace("”", "").replace("\"", "").replace("\n", "").replace("\r", "").replace("\t", "");
+        System.out.println(str);
+    }
 }