From b9675b8776553828294bc635879d317b7bb83cc2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 29 十一月 2023 20:09:52 +0800
Subject: [PATCH] 1、meterNo改为rtuAddr; 2、去掉一些main方法； 3、pom.xml中依赖common和global的<scope>provided</scope>改为<scope>compile</scope> 4、pipIrr-mwTest-server一些修改； 5、.gitignore文件提交。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index 090085b..14923bd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -30,11 +30,6 @@
<include refid="part_Column_List" />
from ba_role
where deleted!=1
- <trim prefix="and" suffixOverrides="and">
- <if test="name != null">
- name like concat('%', #{name}, '%')
- </if>
- </trim>
</select>
<select id="selectByUserId" resultMap="partResultMap">
@@ -70,7 +65,7 @@
order by id DESC
<trim prefix="limit " >
<if test="start != null and count != null">
- #{start}, #{count}
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
</if>
</trim>
</select>
@@ -110,7 +105,7 @@
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
update ba_role
<set>
<if test="name != null">
@@ -123,7 +118,7 @@
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
update ba_role
set `name` = #{name,jdbcType=VARCHAR},
deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
--
Gitblit v1.8.0