From b8646a66b432920ba9c6b21964d0f132973b7dfc Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期一, 29 四月 2024 11:29:44 +0800
Subject: [PATCH] 产品管理相关

---
 pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index cfc729f..8404420 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -8,6 +8,7 @@
     <result column="name" property="name" />
     <result column="disabled" property="disabled" />
     <result column="deleted" property="deleted" />
+    <result column="dt" property="dt" />
   </resultMap>
   <resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
     <result column="id" property="id" />
@@ -15,17 +16,17 @@
   </resultMap>
 
   <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
-    <collection property="priIds" ofType="java.lang.String" fetchType="eager" column="{roleId=id}" select="com.dy.pmsGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />
+    <collection property="priIds" ofType="java.lang.Integer" fetchType="eager" column="{roleId=id}" select="com.dy.pmsGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />
   </resultMap>
 
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, `name`, disabled, deleted
+    id, `name`, disabled, deleted,dt
   </sql>
 
   <sql id="Part_Column_List">
     <!--@mbg.generated-->
-    id, `name`, disabled
+    id, `name`, disabled,dt
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="someResultMap">
@@ -146,6 +147,12 @@
       <if test="name != null and name != ''">
         r.name like concat('%', #{name}, '%') and
       </if>
+      <if test="disabled != null and disabled != ''">
+        r.disabled =#{disabled,jdbcType=BOOLEAN} and
+      </if>
+      <if test="dt != null and dt != ''">
+        DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
+      </if>
     </trim>
     order by id DESC
     <trim prefix="limit " >

--
Gitblit v1.8.0