diff --git a/src/main/java/com/zcloud/controller/bus/ListManagerController.java b/src/main/java/com/zcloud/controller/bus/ListManagerController.java index e72e0909..5e84340c 100644 --- a/src/main/java/com/zcloud/controller/bus/ListManagerController.java +++ b/src/main/java/com/zcloud/controller/bus/ListManagerController.java @@ -937,14 +937,20 @@ public class ListManagerController extends BaseController { pd = this.getPageData(); String NAME = ""; String KEYWORDS = ""; + String LEVELID = ""; if(Tools.notEmpty(pd.getString("USERNAME"))){ NAME = pd.getString("USERNAME"); - }if(Tools.notEmpty(pd.getString("KEYWORDS"))){ + } + if(Tools.notEmpty(pd.getString("KEYWORDS"))){ KEYWORDS = pd.getString("KEYWORDS"); } + if(Tools.notEmpty(pd.getString("LEVELID"))){ + LEVELID = pd.getString("LEVELID"); + } pd = listmanagerService.findById(pd); //根据ID读取 pd.put("USERNAME",NAME); //用于清单编辑时查询功能 pd.put("KEYWORDS",KEYWORDS); + pd.put("LEVELID",LEVELID); List varList = listcheckitemService.listAll(pd); for (PageData item : varList) { item.put("RECORDITEM_ID", this.get32UUID()); //主键 diff --git a/src/main/resources/mybatis/datasource/bus/ListCheckItemMapper.xml b/src/main/resources/mybatis/datasource/bus/ListCheckItemMapper.xml index 07f3f15f..4e50ff5a 100644 --- a/src/main/resources/mybatis/datasource/bus/ListCheckItemMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/ListCheckItemMapper.xml @@ -188,6 +188,9 @@ chi.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') ) + + and d5.BIANMA LIKE CONCAT(CONCAT('%', #{LEVELID}),'%') + ORDER by un.RISKUNITNAME ,id.PARTSNAME,f.CREATTIME desc -- order by f.LISTMANAGER_ID desc