Commit 29da3ddd authored by 赵啸非's avatar 赵啸非

添加站点事项过滤

parent 3576d6d6
...@@ -191,13 +191,6 @@ ...@@ -191,13 +191,6 @@
<version>0.4.5</version> <version>0.4.5</version>
</dependency> </dependency>
<!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>2.3.0.RELEASE</version>
</dependency>
-->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
......
...@@ -7,7 +7,6 @@ import com.mortals.framework.model.PageInfo; ...@@ -7,7 +7,6 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.FiletypeEnum;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.BeanUtil; import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.common.utils.FreeMarkerUtils; import com.mortals.xhx.common.utils.FreeMarkerUtils;
...@@ -23,9 +22,7 @@ import com.mortals.xhx.module.skin.service.SkinFieldService; ...@@ -23,9 +22,7 @@ import com.mortals.xhx.module.skin.service.SkinFieldService;
import freemarker.template.Template; import freemarker.template.Template;
import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.http.entity.ContentType;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -35,7 +32,10 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -35,7 +32,10 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile;
import java.io.*; import java.io.*;
import java.util.*; import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</select> </select>
<!-- 获取事项差集列表列表 --> <!-- 获取事项差集列表列表 -->
<select id="getSubList" parameterType="paramDto" resultMap="ResourceEntity-Map"> <select id="getSubList" parameterType="paramDto" resultMap="MatterEntity-Map">
select select
<include refid="_columns"/> <include refid="_columns"/>
FROM FROM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment