Merge remote-tracking branch 'origin/dev2' into dev2

PAS/src/main/java/cn/cslg/pas/common/model/dto/EventQueryPageDTO.java

@@ -1,6 +1,8 @@
 package cn.cslg.pas.common.model.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * 事件的分页查询DTO类
@@ -8,6 +10,8 @@ import lombok.Data;
  * @Author chenyu
  * @Date 2023/4/2
  */
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @Data
 public class EventQueryPageDTO extends PageDTO2 {
     /**
@@ -22,5 +26,9 @@ public class EventQueryPageDTO extends PageDTO2 {
      * 租户id
      */
     private Integer tenantId;
+    /**
+     * 应用场景value
+     */
+    private Integer applicationScenario;
 
 }

PAS/src/main/java/cn/cslg/pas/common/model/dto/QueryInvestigationTypeProjectNumberDTO.java

@@ -0,0 +1,26 @@
+package cn.cslg.pas.common.model.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 根据应用场景和事件id查询调查类型对应的专题库数量(该事件对应的专题库中该应用场景的专题库数量)
+ *
+ * @Author chenyu
+ * @Date 2023/4/17
+ */
+@Accessors(chain = true)
+@Data
+public class QueryInvestigationTypeProjectNumberDTO implements Serializable {
+    /**
+     * 应用场景
+     */
+    private Integer applicationScenario;
+    /**
+     * 事件id
+     */
+    private Integer eventId;
+
+}

PAS/src/main/java/cn/cslg/pas/common/model/vo/ApplicationScenarioEventNumberVO.java

@@ -0,0 +1,38 @@
+package cn.cslg.pas.common.model.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 应用场景及对应的事件数量
+ *
+ * @Author chenyu
+ * @Date 2023/4/15
+ */
+@Accessors(chain = true)
+@Data
+public class ApplicationScenarioEventNumberVO implements Serializable {
+    /**
+     * 应用场景数值
+     */
+    private Integer applicationScenarioValue;
+    /**
+     * 应用场景名称
+     */
+    private String applicationScenarioName;
+    /**
+     * 应用场景直接对应的事件数量
+     */
+    private Integer eventNumberFromEvent;
+    /**
+     * 应用场景对应的专题库中事件的数量
+     */
+    private Integer eventNumberFromProject;
+    /**
+     * 事件数量
+     */
+    private Integer eventNumber;
+
+}

PAS/src/main/java/cn/cslg/pas/common/model/vo/EventListItemVO.java

@@ -36,7 +36,7 @@ public class EventListItemVO implements Serializable {
      */
     private String applicationScenario;
     /**
-     * 应用场景ids
+     * 应用场景values
      */
     private List<Integer> applicationScenarios;
     /**

PAS/src/main/java/cn/cslg/pas/common/model/vo/InvestigationTypeProjectNumberVO.java

@@ -0,0 +1,28 @@
+package cn.cslg.pas.common.model.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @Author chenyu
+ * @Date 2023/4/17
+ */
+@Accessors(chain = true)
+@Data
+public class InvestigationTypeProjectNumberVO implements Serializable {
+    /**
+     * 调查类型
+     */
+    private Integer investigationType;
+    /**
+     * 调查类型名称
+     */
+    private String investigationTypeName;
+    /**
+     * 专题库数量
+     */
+    private Integer projectNumber;
+
+}

PAS/src/main/java/cn/cslg/pas/controller/EventController.java

@@ -1,10 +1,10 @@
 package cn.cslg.pas.controller;
 
+import cn.cslg.pas.common.JsonPage;
 import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.model.dto.EventAddNewDTO;
-import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
-import cn.cslg.pas.common.model.dto.EventUpdateDTO;
-import cn.cslg.pas.common.model.dto.ProjectEventAddNewDTO;
+import cn.cslg.pas.common.model.dto.*;
+import cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO;
+import cn.cslg.pas.common.model.vo.InvestigationTypeProjectNumberVO;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.service.IEventService;
@@ -14,7 +14,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -64,6 +63,30 @@ public class EventController {
 
     }
 
+    @Operation(summary = "查询9大应用场景及分别对应的事件数量")
+    @GetMapping("/queryApplicationScenarioEventNumber")
+    public String queryApplicationScenarioEventNumber() {
+        log.info("开始处理【查询9大应用场景及分别对应的事件数量】的请求");
+        List<ApplicationScenarioEventNumberVO> queryResults = eventService.queryApplicationScenarioEventNumber();
+        return Response.success(queryResults);
+    }
+
+    @Operation(summary = "根据应用场景value和事件名称分页查询事件清单")
+    @PostMapping("/queryEvents")
+    public String queryEvents(@RequestBody EventQueryPageDTO eventQueryPageDTO) {
+        log.info("开始处理【根据应用场景value和事件名称分页查询事件清单】的请求，请求参数为：{}", eventQueryPageDTO);
+        JsonPage jsonPage = eventService.queryEvents(eventQueryPageDTO);
+        return Response.success(jsonPage);
+    }
+
+    @Operation(summary = "根据应用场景和事件id查询调查类型对应的专题库数量")
+    @PostMapping("/queryInvestigationTypeProjectNumber")
+    public String queryInvestigationTypeProjectNumber(@RequestBody QueryInvestigationTypeProjectNumberDTO queryInvestigationTypeProjectNumberDTO) {
+        List<InvestigationTypeProjectNumberVO> queryResults = eventService.queryInvestigationTypeProjectNumber(queryInvestigationTypeProjectNumberDTO);
+        return Response.success(queryResults);
+    }
+
+
     @Operation(summary = "修改事件")
     @PostMapping("/update")
     public String update(@RequestBody EventUpdateDTO eventUpdateDTO) {

PAS/src/main/java/cn/cslg/pas/domain/Type.java

@@ -0,0 +1,26 @@
+package cn.cslg.pas.domain;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 调查类型
+ *
+ * @Author chenyu
+ * @Date 2023/4/17
+ */
+@Accessors(chain = true)
+@Data
+public class Type implements Serializable {
+    /**
+     * 调查类型数值
+     */
+    private Integer typeId;
+    /**
+     * 调查类型名称
+     */
+    private String typeName;
+
+}

PAS/src/main/java/cn/cslg/pas/mapper/EventMapper.java

@@ -1,8 +1,13 @@
 package cn.cslg.pas.mapper;
 
 import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
+import cn.cslg.pas.common.model.dto.QueryInvestigationTypeProjectNumberDTO;
+import cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO;
 import cn.cslg.pas.common.model.vo.EventListItemVO;
+import cn.cslg.pas.common.model.vo.InvestigationTypeProjectNumberVO;
 import cn.cslg.pas.domain.Event;
+import cn.cslg.pas.domain.Project;
+import cn.cslg.pas.domain.Type;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
@@ -33,5 +38,36 @@ public interface EventMapper extends BaseMapper<Event> {
      */
     List<EventListItemVO> queryList(EventQueryPageDTO eventQueryPageDTO);
 
+    /**
+     * 根据应用场景value和事件名称分页查询事件清单
+     *
+     * @param eventQueryPageDTO 查询参数
+     * @return 返回查询到的列表
+     */
+    List<EventListItemVO> queryEvents(EventQueryPageDTO eventQueryPageDTO);
+
+    /**
+     * 查询9大应用场景及分别对应的事件数量
+     *
+     * @param tenantId 租户id
+     * @return 返回查询到的数据
+     */
+    List<ApplicationScenarioEventNumberVO> queryApplicationScenarioEventNumber(Integer tenantId);
+
+    /**
+     * 根据应用场景查询调查类型
+     *
+     * @param applicationScenario 应用场景value
+     * @return 返回查询到的数据
+     */
+    List<Type> queryTypeid(Integer applicationScenario);
+
+    /**
+     * 根据事件id查询专题库
+     *
+     * @param eventId 事件id
+     * @return 返回查询到的数据
+     */
+    List<Project> queryProjects(Integer eventId);
 
 }

PAS/src/main/java/cn/cslg/pas/service/IEventService.java

@@ -1,10 +1,9 @@
 package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.JsonPage;
-import cn.cslg.pas.common.model.dto.EventAddNewDTO;
-import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
-import cn.cslg.pas.common.model.dto.EventUpdateDTO;
-import cn.cslg.pas.common.model.dto.ProjectEventAddNewDTO;
+import cn.cslg.pas.common.model.dto.*;
+import cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO;
+import cn.cslg.pas.common.model.vo.InvestigationTypeProjectNumberVO;
 import cn.cslg.pas.domain.Event;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +42,30 @@ public interface IEventService extends IService<Event> {
     JsonPage query(EventQueryPageDTO eventQueryPageDTO);
 
     /**
+     * 查询9大应用场景及分别对应的事件数量
+     *
+     * @return 返回查询到的数据
+     */
+    List<ApplicationScenarioEventNumberVO> queryApplicationScenarioEventNumber();
+
+    /**
+     * 根据应用场景value和事件名称分页查询事件清单
+     *
+     * @param eventQueryPageDTO 查询参数
+     * @return 返回查询到的数据
+     */
+    JsonPage queryEvents(EventQueryPageDTO eventQueryPageDTO);
+
+    /**
+     * 根据应用场景和事件id查询调查类型对应的专题库数量
+     *
+     * @param queryInvestigationTypeProjectNumberDTO 查询参数
+     * @return 返回查询到的数据
+     */
+    List<InvestigationTypeProjectNumberVO> queryInvestigationTypeProjectNumber(QueryInvestigationTypeProjectNumberDTO queryInvestigationTypeProjectNumberDTO);
+
+
+    /**
      * 修改事件
      *
      * @param eventUpdateDTO 修改事件的DTO类对象

PAS/src/main/java/cn/cslg/pas/service/impl/EventServiceImpl.java

@@ -2,17 +2,16 @@ package cn.cslg.pas.service.impl;
 
 import cn.cslg.pas.common.JsonPage;
 import cn.cslg.pas.common.model.PersonnelVO;
-import cn.cslg.pas.common.model.dto.EventAddNewDTO;
-import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
-import cn.cslg.pas.common.model.dto.EventUpdateDTO;
-import cn.cslg.pas.common.model.dto.ProjectEventAddNewDTO;
+import cn.cslg.pas.common.model.dto.*;
+import cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO;
 import cn.cslg.pas.common.model.vo.EventListItemVO;
+import cn.cslg.pas.common.model.vo.InvestigationTypeProjectNumberVO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.ThrowException;
 import cn.cslg.pas.domain.Event;
 import cn.cslg.pas.domain.Project;
-import cn.cslg.pas.domain.asso.AssoEventProject;
+import cn.cslg.pas.domain.Type;
 import cn.cslg.pas.mapper.EventMapper;
 import cn.cslg.pas.mapper.asso.AssoEventProjectMapper;
 import cn.cslg.pas.service.IAssoEventProjectService;
@@ -154,10 +153,10 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         Integer current = eventQueryPageDTO.getCurrent();
         Integer size = eventQueryPageDTO.getSize();
         String orderBy = eventQueryPageDTO.getOrderBy();
+        //将前端传来的需要排序的字段做映射转换(如：xxxAxxBxx -> xxx_axx_bxx)
         if (orderBy != null && !orderBy.equals("")) {
             String regex = "[A-Z]+";
-            Pattern compile = Pattern.compile(regex);
-            Matcher matcher = compile.matcher(orderBy);
+            Matcher matcher = Pattern.compile(regex).matcher(orderBy);
             while (matcher.find()) {
                 orderBy = orderBy.replaceFirst(matcher.group(), "_" + matcher.group().toLowerCase());
             }
@@ -168,17 +167,107 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             PageHelper.startPage(current, size);
         }
         List<EventListItemVO> queryResults = eventMapper.queryList(eventQueryPageDTO);
+        //将以逗号拼接的字符串应用场景applicationScenario转化为应用场景value集合
         for (EventListItemVO queryResult : queryResults) {
             String applicationScenario = queryResult.getApplicationScenario();
             if (applicationScenario != null && !applicationScenario.equals("")) {
-                List<Integer> applicationScenarioIds = Arrays.stream(applicationScenario.split(",")).map(Integer::parseInt).collect(Collectors.toList());
-                queryResult.setApplicationScenarios(applicationScenarioIds);
+                String[] applicationScenarioArr = applicationScenario.split(",");
+                ArrayList<Integer> applicationScenarioValues = new ArrayList<>();
+                for (String n : applicationScenarioArr) {
+                    applicationScenarioValues.add(Integer.parseInt(n));
+                }
+                //List<Integer> applicationScenarioIds = Arrays.stream(applicationScenario.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+                queryResult.setApplicationScenarios(applicationScenarioValues);
             }
         }
         return JsonPage.restPage(new PageInfo<>(queryResults));
     }
 
     /**
+     * 查询9大应用场景及分别对应的事件数量
+     */
+    @Override
+    public List<ApplicationScenarioEventNumberVO> queryApplicationScenarioEventNumber() {
+        log.info("开始处理【查询9大应用场景及分别对应的事件数量】的业务");
+
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
+
+        List<ApplicationScenarioEventNumberVO> applicationScenarioEventNumberVOS = eventMapper.queryApplicationScenarioEventNumber(tenantId);
+        //遍历给事件数量属性赋上值 (事件数量=应用场景直接对应的事件数量+应用场景对应的专题库对应的事件数量(且该部分事件没有直接应用场景))
+        for (ApplicationScenarioEventNumberVO n : applicationScenarioEventNumberVOS) {
+            n.setEventNumber(n.getEventNumberFromEvent() + n.getEventNumberFromProject());
+        }
+        return applicationScenarioEventNumberVOS;
+    }
+
+    /**
+     * 根据应用场景value和事件名称分页查询事件清单
+     *
+     * @param eventQueryPageDTO 查询参数
+     */
+    @Override
+    public JsonPage queryEvents(EventQueryPageDTO eventQueryPageDTO) {
+        log.info("开始处理【根据应用场景value和事件名称分页查询事件清单】的业务，参数为：{}", eventQueryPageDTO);
+
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        eventQueryPageDTO.setTenantId(personnelVO.getTenantId());
+        Integer current = eventQueryPageDTO.getCurrent();
+        Integer size = eventQueryPageDTO.getSize();
+
+        if (current != null && size != null) {
+            PageHelper.startPage(current, size);
+        }
+
+        //根据应用场景value和事件名称分页查询事件清单
+        List<EventListItemVO> events = eventMapper.queryEvents(eventQueryPageDTO);
+        return JsonPage.restPage(new PageInfo<>(events));
+    }
+
+    /**
+     * 根据应用场景和事件id查询调查类型对应的专题库数量
+     *
+     * @param queryInvestigationTypeProjectNumberDTO 查询参数
+     * @return 返回查询到的数据
+     */
+    @Override
+    public List<InvestigationTypeProjectNumberVO> queryInvestigationTypeProjectNumber(QueryInvestigationTypeProjectNumberDTO queryInvestigationTypeProjectNumberDTO) {
+        log.info("开始处理【根据应用场景和事件id查询调查类型对应的专题库数量】的业务，参数为：{}", queryInvestigationTypeProjectNumberDTO);
+
+        Integer applicationScenario = queryInvestigationTypeProjectNumberDTO.getApplicationScenario();
+        Integer eventId = queryInvestigationTypeProjectNumberDTO.getEventId();
+        //1.根据应用场景查询出所有调查类型
+        List<Type> types = eventMapper.queryTypeid(applicationScenario);
+        //2.根据事件id查询出所有专题库
+        List<Project> projects = eventMapper.queryProjects(eventId);
+
+        //3.遍历调查类型，在每一个调查类型中遍历专题库，装载调查类型对应的专题库数量
+        ArrayList<InvestigationTypeProjectNumberVO> results = new ArrayList<>();
+        for (Type type : types) {
+            InvestigationTypeProjectNumberVO result = new InvestigationTypeProjectNumberVO();
+            result.setInvestigationType(type.getTypeId());
+            result.setInvestigationTypeName(type.getTypeName());
+            int projectNumber = 0;
+            if (projects != null) {
+                for (Project project : projects) {
+                    if (project.getType() != null) {
+                        String[] typeArr = project.getType().split(",");
+                        if (new ArrayList<>(Arrays.asList(typeArr)).contains(type.getTypeId() + "")) {
+                            projectNumber++;
+                        }
+                    }
+                }
+            }
+            result.setProjectNumber(projectNumber);
+            results.add(result);
+        }
+
+        return results;
+
+    }
+
+
+    /**
      * 修改事件
      *
      * @param eventUpdateDTO 修改事件的DTO类对象

PAS/src/main/java/cn/cslg/pas/service/impl/ProductServiceImpl.java

@@ -97,8 +97,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         product
                 .setCreatePersonId(personnelVO.getId())
-                .setCreatePersonName(personnelVO.getName())
-                .setTenantId(personnelVO.getTenantId());
+                .setCreatePersonName(personnelVO.getName());
         //数据入产品表
         log.info("数据入产品表");
         int rows = productMapper.insert(product);

PAS/src/main/resources/mapper/EventMapper.xml

@@ -87,4 +87,120 @@
         order by id
     </select>
 
+    <!--根据应用场景value和事件名称分页查询事件清单-->
+    <!--List<EventListItemVO> queryEvents(EventQueryPageDTO eventQueryPageDTO);-->
+    <select id="queryEvents" resultMap="queryByApplicationScenarioMap">
+        select id,
+        question_name,
+        description,
+        application_scenario,
+        event_date,
+        tenant_id,
+        create_person_id,
+        create_person_name,
+        create_time,
+        modified_time
+        from event
+        <where>
+            <if test="applicationScenario != null and applicationScenario != ''">
+                and id in(select id from event where find_in_set(#{applicationScenario}, application_scenario)
+                union select even.id
+                from os_thematic proj
+                join asso_event_project asso on proj.id = asso.project_id
+                join event even on asso.event_id = even.id
+                where find_in_set(#{applicationScenario}, proj.scenarioid)
+                and even.application_scenario is null
+                )
+            </if>
+            <if test="questionName != null and questionName != ''">
+                and question_name like '%${questionName}%'
+            </if>
+            <if test="true">
+                and tenant_id = #{tenantId}
+            </if>
+        </where>
+        order by create_time
+    </select>
+
+    <resultMap id="queryByApplicationScenarioMap" type="cn.cslg.pas.common.model.vo.EventListItemVO">
+        <id column="id" property="id"/>
+        <result column="question_name" property="questionName"/>
+        <result column="description" property="description"/>
+        <result column="application_scenario" property="applicationScenario"/>
+        <result column="event_date" property="eventDate"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_person_id" property="createPersonId"/>
+        <result column="create_person_name" property="createPersonName"/>
+        <result column="create_time" property="createTime"/>
+        <result column="modified_time" property="modifiedTime"/>
+    </resultMap>
+
+    <!--查询9大应用场景及分别对应的事件数量-->
+    <!--List<ApplicationScenarioEventNumber> queryApplicationScenarioEventNumber(Integer tenantId);-->
+    <select id="queryApplicationScenarioEventNumber" resultMap="queryApplicationScenarioEventNumberMap">
+        select label,
+               value       as applicationScenarioValue,
+               #{tenantId} as tenantId
+        from os_system_dict
+        where type = "ENTERPRISE_APPLICATION_SCENARIO"
+    </select>
+
+    <resultMap id="queryApplicationScenarioEventNumberMap"
+               type="cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO">
+        <id column="id" property="applicationScenarioId"/>
+        <result column="label" property="applicationScenarioName"/>
+        <result column="value" property="applicationScenarioName"/>
+        <collection property="eventNumberFromEvent" ofType="integer"
+                    select="selectEventCount1"
+                    column="{applicationScenarioValue=applicationScenarioValue, tenantId=tenantId}">
+        </collection>
+        <collection property="eventNumberFromProject" ofType="integer"
+                    select="selectEventCount2"
+                    column="{applicationScenarioValue=applicationScenarioValue, tenantId=tenantId}">
+        </collection>
+    </resultMap>
+
+    <select id="selectEventCount1" resultType="integer">
+        select count(*)
+        from event
+        where find_in_set(#{applicationScenarioValue}, application_scenario)
+          and tenant_id = #{tenantId}
+    </select>
+
+    <select id="selectEventCount2" resultType="integer">
+        select count(*)
+        from os_thematic proj
+                 join asso_event_project asso on proj.id = asso.project_id
+                 join event even on asso.event_id = even.id
+        where find_in_set(#{applicationScenarioValue}, proj.scenarioid)
+          and even.application_scenario is null
+          and tenant_id = #{tenantId}
+    </select>
+
+    <!--根据应用场景查询调查类型-->
+    <!--List<Type> queryTypeid(Integer applicationScenario);-->
+    <select id="queryTypeid" resultMap="queryTypeidMap">
+        select DICT_CHILD_VALUE, DICT_CHILD_LABEL
+        from os_system_dict_associate
+        where DICT_PARENT_VALUE = #{applicationScenario}
+    </select>
+
+    <resultMap id="queryTypeidMap" type="cn.cslg.pas.domain.Type">
+        <result column="DICT_CHILD_VALUE" property="typeId"/>
+        <result column="DICT_CHILD_LABEL" property="typeName"/>
+    </resultMap>
+
+    <!--根据事件id查询专题库-->
+    <!--List<Project> queryProjects(Integer eventId);-->
+    <select id="queryProjects" resultMap="queryProjectsMap">
+        select typeid
+        from asso_event_project asso
+                 join os_thematic proj on asso.project_id = proj.id
+        where event_id = #{eventId}
+    </select>
+
+    <resultMap id="queryProjectsMap" type="cn.cslg.pas.domain.Project">
+        <result column="typeid" property="type"/>
+    </resultMap>
+
 </mapper>

PAS/src/main/resources/mapper/ProductMapper.xml

@@ -133,6 +133,9 @@
             </otherwise>
         </choose>
     </select>
+    <!--            <if test="tenantId != null and tenantId != ''">-->
+    <!--                and p.create_person_id in (select id from PERSONNEL per where per.TENANT_ID = #{tenantId})-->
+    <!--            </if>-->
 
     <resultMap id="queryMap" type="cn.cslg.pas.common.model.vo.ProductVO">
         <id column="p_id" property="id"/>