文书档案下穿

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookAqbwbndjhMapper.xml

@@ -79,9 +79,9 @@
             <if test="aq.year != null ">
                 and a.year = #{aq.year}
             </if>
-            <if test="aq.orgId != null ">
-                and a.org_id = #{aq.orgId}
-            </if>
+<!--            <if test="aq.orgId != null ">-->
+<!--                and a.org_id = #{aq.orgId}-->
+<!--            </if>-->
             <if test="aq.range!=null and aq.range.size >1">
                 and  a.date <![CDATA[>=]]>  #{aq.range[0]} and a.date  <![CDATA[<=]]> #{aq.range[1]}
             </if>

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookHsggbsdjMapper.xml

@@ -72,9 +72,9 @@
             <if test="hs.title != null  and hs.title != ''">
                 and h.title like concat(concat('%', #{hs.title}),'%')
             </if>
-            <if test="hs.orgId != null ">
-                and h.org_id = #{hs.orgId}
-            </if>
+<!--            <if test="hs.orgId != null ">-->
+<!--                and h.org_id = #{hs.orgId}-->
+<!--            </if>-->
             <if test="hs.range!=null and hs.range.size >1">
                 and  h.date <![CDATA[>=]]>  #{hs.range[0]} and h.date  <![CDATA[<=]]> #{hs.range[1]}
             </if>

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/FileUploadUtils.java

@@ -12,7 +12,7 @@ import com.xunmei.common.core.utils.file.FileTypeUtils;
 import com.xunmei.common.core.utils.file.MimeTypeUtils;
 import com.xunmei.common.core.utils.uuid.Seq;
 import com.xunmei.file.vo.FileBase64Vo;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;