From bb3bc1c8508dc28d1780c2b0e068595baedb5100 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期五, 12 一月 2024 16:42:17 +0800 Subject: [PATCH] 修改 --- modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml index c822433..6c71c2e 100644 --- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml +++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml @@ -4,11 +4,14 @@ <mapper namespace="com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao"> <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse"> - select a.* ,p.* + select a.* ,p.software_name,p.code AS projectCode from config_item_warehouse a - INNER JOIN project p ON p.id = a.project_id + JOIN project p ON p.id = a.project_id <where> a.is_delete = 0 and p.is_delete = 0 + <if test="secretClass!=null"> + and p.secret_class <= #{secretClass} + </if> <if test="whereSql!=null"> and ${whereSql} </if> @@ -19,12 +22,12 @@ </select> <select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit"> SET @row_number = 0; - SELECT dd.dict_label AS name, + SELECT dd.dict_label AS examineItem, (@row_number := @row_number + 1) AS no FROM sys_dict_type dt - JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID + JOIN sys_dict_data dd ON dt.id = dd.dict_type_id <where> - dd.IS_DELETE = 0 + dd.is_delete = 0 <if test="dictType != null and dictType != ''"> and dt.DICT_TYPE = #{dictType} </if> -- Gitblit v1.9.1