guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

一般隐患台账搜索后的表格是空表14649

limingyu-20240328-0328测试内容
limingyu 2024-03-28 17:59:01 +08:00
parent 6c6c1c77b3
commit 2b8ec84717
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zcloud/controller/bus/HiddenExcelController.java
View File

@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.service.hiddenApi.HiddenApiService; import com.zcloud.service.hiddenApi.HiddenApiService;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.util.Strings; import org.apache.logging.log4j.util.Strings;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -272,6 +273,12 @@ public class HiddenExcelController extends BaseController {
if ("list".equals(pd.getString("hiddenVueType"))) { // 整改隐患 if ("list".equals(pd.getString("hiddenVueType"))) { // 整改隐患
pd = Jurisdiction.getUserDataJurisdiction(pd); pd = Jurisdiction.getUserDataJurisdiction(pd);
} }
if (pd.getString("hiddenType") != null && Tools.notEmpty(pd.getString("hiddenType"))) {
String[] hiddenTypes = pd.getString("hiddenType").split(",");
// 将数组转为list
List<String> hiddenTypeList = Arrays.asList(hiddenTypes);
pd.put("hiddenTypeList", hiddenTypeList);
}
List<PageData> getListAll = hiddenApiService.getListAll(pd); // 列出Hidden列表 List<PageData> getListAll = hiddenApiService.getListAll(pd); // 列出Hidden列表
return getListAll; return getListAll;

10
src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
View File

@ -587,8 +587,14 @@
<if test="state != null and state != ''"> <!-- 隐患状态--> <if test="state != null and state != ''"> <!-- 隐患状态-->
and f.STATE = #{state} and f.STATE = #{state}
</if> </if>
<if test="hiddenType != null and hiddenType != ''"><!-- 隐患类型 --> <!-- <if test="hiddenType != null and hiddenType != ''">&lt;!&ndash; 隐患类型 &ndash;&gt;-->
and f.HIDDENTYPE = #{hiddenType} <!-- and f.HIDDENTYPE = #{hiddenType}-->
<!-- </if>-->
<if test="hiddenTypeList != null and hiddenTypeList.size > 0"><!-- 隐患类型 -->
and f.HIDDENTYPE in
<foreach collection="hiddenTypeList" item="item" separator="," close=")" open="(" index="index">
#{item}
</foreach>
</if> </if>
<if test="confirmUserName != null and confirmUserName != ''"><!-- 确认人 --> <if test="confirmUserName != null and confirmUserName != ''"><!-- 确认人 -->
and ( and (