diff --git a/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java b/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java index dc99cabb..4625f747 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import com.zcloud.entity.Page; import com.zcloud.service.hiddenApi.HiddenApiService; +import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -272,6 +273,12 @@ public class HiddenExcelController extends BaseController { if ("list".equals(pd.getString("hiddenVueType"))) { // 整改隐患 pd = Jurisdiction.getUserDataJurisdiction(pd); } + if (pd.getString("hiddenType") != null && Tools.notEmpty(pd.getString("hiddenType"))) { + String[] hiddenTypes = pd.getString("hiddenType").split(","); + // 将数组转为list + List hiddenTypeList = Arrays.asList(hiddenTypes); + pd.put("hiddenTypeList", hiddenTypeList); + } List getListAll = hiddenApiService.getListAll(pd); // 列出Hidden列表 return getListAll; diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index abbca825..f92c1c0e 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -587,8 +587,14 @@ and f.STATE = #{state} - - and f.HIDDENTYPE = #{hiddenType} + + + + + and f.HIDDENTYPE in + + #{item} + and (