From 05c348cc2e3962b79215aa1ea7b8ed6a72e2d13c Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 27 Mar 2024 09:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90XML?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E9=83=A8=E5=88=86=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?id=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzya/frame/web/entity/BaseEntity.java |   7 +
 .../frame/sys/role/entity/SysRoleEntity.xml   | 421 +++++++++---------
 2 files changed, 225 insertions(+), 203 deletions(-)

diff --git a/common/src/main/java/com/hzya/frame/web/entity/BaseEntity.java b/common/src/main/java/com/hzya/frame/web/entity/BaseEntity.java
index 3bd5beb6..0bcc2d51 100644
--- a/common/src/main/java/com/hzya/frame/web/entity/BaseEntity.java
+++ b/common/src/main/java/com/hzya/frame/web/entity/BaseEntity.java
@@ -282,4 +282,11 @@ public class BaseEntity implements Serializable {
             this.dataSourceCode = "master";
     }
 
+    public Long getSorts() {
+        return sorts;
+    }
+
+    public void setSorts(Long sorts) {
+        this.sorts = sorts;
+    }
 }
diff --git a/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.xml b/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.xml
index e8c72a06..c8934c46 100644
--- a/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.sys.role.dao.impl.SysRoleDaoImpl">
 
-    <resultMap id="get-SysRoleEntity-result" type="com.hzya.frame.sys.role.entity.SysRoleEntity" >
-       <result property="id" column="id" jdbcType="VARCHAR"/>
-           <result property="roleCode" column="role_code" jdbcType="VARCHAR"/>
-           <result property="roleName" column="role_name" jdbcType="VARCHAR"/>
-           <result property="description" column="description" jdbcType="VARCHAR"/>
-           <result property="sorts" column="sorts" jdbcType="INTEGER"/>
-           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
-           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
-           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
-           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
-           <result property="sts" column="sts" jdbcType="VARCHAR"/>
-           <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
-           <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
-        </resultMap>
+    <resultMap id="get-SysRoleEntity-result" type="com.hzya.frame.sys.role.entity.SysRoleEntity">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="roleCode" column="role_code" jdbcType="VARCHAR"/>
+        <result property="roleName" column="role_name" jdbcType="VARCHAR"/>
+        <result property="description" column="description" jdbcType="VARCHAR"/>
+        <result property="sorts" column="sorts" jdbcType="INTEGER"/>
+        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+        <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+    </resultMap>
     <!-- 查询的字段-->
-    <sql id = "SysRoleEntity_Base_Column_List">
+    <sql id="SysRoleEntity_Base_Column_List">
         id
        ,role_code 
         ,role_name 
@@ -31,207 +31,222 @@
         ,org_id 
         ,company_id 
      </sql>
- <!-- 查询 采用==查询 -->
- <select id="entity_list_base" resultMap="get-SysRoleEntity-result" parameterType = "com.hzya.frame.sys.role.entity.SysRoleEntity">
-    select
-    <include refid="SysRoleEntity_Base_Column_List" />
-    from sys_role
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="roleCode != null and roleCode != ''"> and role_code = #{roleCode} </if>
-            <if test="roleName != null and roleName != ''"> and role_name = #{roleName} </if>
-            <if test="description != null and description != ''"> and description = #{description} </if>
-            <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
-            <if test="create_time != null"> and create_time = #{create_time} </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
-            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
-            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-            <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
-            <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-SysRoleEntity-result"
+            parameterType="com.hzya.frame.sys.role.entity.SysRoleEntity">
+        select
+        <include refid="SysRoleEntity_Base_Column_List"/>
+        from sys_role
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="roleCode != null and roleCode != ''">and role_code = #{roleCode}</if>
+            <if test="roleName != null and roleName != ''">and role_name = #{roleName}</if>
+            <if test="description != null and description != ''">and description = #{description}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
             and sts='Y'
-    </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-    
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.role.entity.SysRoleEntity">
-        select  count(1)   from sys_role
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="roleCode != null and roleCode != ''"> and role_code = #{roleCode} </if>
-            <if test="roleName != null and roleName != ''"> and role_name = #{roleName} </if>
-            <if test="description != null and description != ''"> and description = #{description} </if>
-            <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
-            <if test="create_time != null"> and create_time = #{create_time} </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
-            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
-            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-            <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
-            <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer" parameterType="com.hzya.frame.sys.role.entity.SysRoleEntity">
+        select count(1) from sys_role
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="roleCode != null and roleCode != ''">and role_code = #{roleCode}</if>
+            <if test="roleName != null and roleName != ''">and role_name = #{roleName}</if>
+            <if test="description != null and description != ''">and description = #{description}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
             and sts='Y'
-    </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-SysRoleEntity-result" parameterType = "com.hzya.frame.sys.role.entity.SysRoleEntity">
-    select
-    <include refid="SysRoleEntity_Base_Column_List" />
-    from sys_role
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
-            <if test="roleCode != null and roleCode != ''"> and role_code like concat('%',#{roleCode},'%') </if>
-            <if test="roleName != null and roleName != ''"> and role_name like concat('%',#{roleName},'%') </if>
-            <if test="description != null and description != ''"> and description like concat('%',#{description},'%') </if>
-            <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
-            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
-            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
-            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
-            <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
-            <if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%') </if>
+    <select id="entity_list_like" resultMap="get-SysRoleEntity-result"
+            parameterType="com.hzya.frame.sys.role.entity.SysRoleEntity">
+        select
+        <include refid="SysRoleEntity_Base_Column_List"/>
+        from sys_role
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
+            <if test="roleCode != null and roleCode != ''">and role_code like concat('%',#{roleCode},'%')</if>
+            <if test="roleName != null and roleName != ''">and role_name like concat('%',#{roleName},'%')</if>
+            <if test="description != null and description != ''">and description like concat('%',#{description},'%')
+            </if>
+            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+                concat('%',#{create_user_id},'%')
+            </if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+                concat('%',#{modify_user_id},'%')
+            </if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            <if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
+            <if test="companyId != null and companyId != ''">and company_id like concat('%',#{companyId},'%')</if>
             and sts='Y'
-    </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
 
-<!-- 查询列表 字段采用or格式 -->
-<select id="SysRoleentity_list_or" resultMap="get-SysRoleEntity-result" parameterType = "com.hzya.frame.sys.role.entity.SysRoleEntity">
-    select
-    <include refid="SysRoleEntity_Base_Column_List" />
-    from sys_role
-    <trim prefix="where" prefixOverrides="and"> 
-         <if test="id != null and id != ''"> or id = #{id} </if>
-             <if test="roleCode != null and roleCode != ''"> or role_code = #{roleCode} </if>
-             <if test="roleName != null and roleName != ''"> or role_name = #{roleName} </if>
-             <if test="description != null and description != ''"> or description = #{description} </if>
-             <if test="sorts != null"> or sorts = #{sorts} </if>
-             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
-              <if test="create_time != null"> or create_time = #{create_time} </if>
-              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
-              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
-              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
-             <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
-              <if test="companyId != null and companyId != ''"> or company_id = #{companyId} </if>
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="SysRoleentity_list_or" resultMap="get-SysRoleEntity-result"
+            parameterType="com.hzya.frame.sys.role.entity.SysRoleEntity">
+        select
+        <include refid="SysRoleEntity_Base_Column_List"/>
+        from sys_role
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">or id = #{id}</if>
+            <if test="roleCode != null and roleCode != ''">or role_code = #{roleCode}</if>
+            <if test="roleName != null and roleName != ''">or role_name = #{roleName}</if>
+            <if test="description != null and description != ''">or description = #{description}</if>
+            <if test="sorts != null">or sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">or org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">or company_id = #{companyId}</if>
             and sts='Y'
-    </trim>
-    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
+        </trim>
+        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
 
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.sys.role.entity.SysRoleEntity" keyProperty="" useGeneratedKeys="true">
-    insert into sys_role(
-  <trim suffix="" suffixOverrides=",">
-       <if test="id != null and id != ''"> id , </if>
-            <if test="roleCode != null and roleCode != ''"> role_code , </if>
-            <if test="roleName != null and roleName != ''"> role_name , </if>
-            <if test="description != null and description != ''"> description , </if>
-            <if test="sorts != null"> sorts , </if>
-            <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
-            <if test="create_time != null"> create_time , </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
-            <if test="modify_time != null"> modify_time , </if>
-            <if test="sts != null and sts != ''"> sts , </if>
-            <if test="org_id != null and org_id != ''"> org_id , </if>
-            <if test="companyId != null and companyId != ''"> company_id , </if>
+    <!--新增所有列-->
+    <insert id="entity_insert" parameterType="com.hzya.frame.sys.role.entity.SysRoleEntity" keyProperty=""
+            useGeneratedKeys="true">
+        insert into sys_role(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">id ,</if>
+            <if test="roleCode != null and roleCode != ''">role_code ,</if>
+            <if test="roleName != null and roleName != ''">role_name ,</if>
+            <if test="description != null and description != ''">description ,</if>
+            <if test="sorts != null">sorts ,</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="org_id != null and org_id != ''">org_id ,</if>
+            <if test="companyId != null and companyId != ''">company_id ,</if>
             <if test="sorts == null ">sorts,</if>
-    <if test="sts == null ">sts,</if>
-  </trim>
-  )values(
- <trim suffix="" suffixOverrides=",">
-       <if test="id != null and id != ''"> #{id} ,</if>
-            <if test="roleCode != null and roleCode != ''"> #{roleCode} ,</if>
-            <if test="roleName != null and roleName != ''"> #{roleName} ,</if>
-            <if test="description != null and description != ''"> #{description} ,</if>
-            <if test="sorts != null"> #{sorts} ,</if>
-            <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
-            <if test="create_time != null"> #{create_time} ,</if>
-            <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
-            <if test="modify_time != null"> #{modify_time} ,</if>
-            <if test="sts != null and sts != ''"> #{sts} ,</if>
-            <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
-            <if test="companyId != null and companyId != ''"> #{companyId} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_role a WHERE a.sts = 'Y' ),</if>
-    <if test="sts == null ">'Y',</if>
-  </trim>
-  )  
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch" keyProperty="" useGeneratedKeys="true">
-  insert into sys_role(id, role_code, role_name, description, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
-    values
-    <foreach collection="entities" item="entity" separator=",">
-    (#{entity.id},#{entity.roleCode},#{entity.roleName},#{entity.description},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
-    </foreach>
-</insert>
-<!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch" keyProperty="" useGeneratedKeys="true">
-    insert into sys_role(id, role_code, role_name, description, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
-    values
-    <foreach collection="entities" item="entity" separator=",">
-    (#{entity.id},#{entity.roleCode},#{entity.roleName},#{entity.description},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
-    </foreach>
-    on duplicate key update
-    id = values(id),
-    role_code = values(role_code),
-    role_name = values(role_name),
-    description = values(description),
-    sorts = values(sorts),
-    create_user_id = values(create_user_id),
-    create_time = values(create_time),
-    modify_user_id = values(modify_user_id),
-    modify_time = values(modify_time),
-    sts = values(sts),
-    org_id = values(org_id),
-    company_id = values(company_id)</insert>
-<!--通过主键修改方法-->
-<update id="entity_update" parameterType = "com.hzya.frame.sys.role.entity.SysRoleEntity" >
-update sys_role  set
-<trim suffix="" suffixOverrides=",">
-  <if test="id != null and id != ''"> id = #{id},</if>
-  <if test="roleCode != null and roleCode != ''"> role_code = #{roleCode},</if>
-  <if test="roleName != null and roleName != ''"> role_name = #{roleName},</if>
-  <if test="description != null and description != ''"> description = #{description},</if>
-  <if test="sorts != null"> sorts = #{sorts},</if>
-  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
-    <if test="create_time != null"> create_time = #{create_time},</if>
-    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
-    <if test="modify_time != null"> modify_time = #{modify_time},</if>
-    <if test="sts != null and sts != ''"> sts = #{sts},</if>
-  <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
-    <if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
-</trim>
-where  = #{}
-</update>
-<!-- 逻辑删除 -->
-<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.role.entity.SysRoleEntity" >
+            <if test="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id} ,</if>
+            <if test="roleCode != null and roleCode != ''">#{roleCode} ,</if>
+            <if test="roleName != null and roleName != ''">#{roleName} ,</if>
+            <if test="description != null and description != ''">#{description} ,</if>
+            <if test="sorts != null">#{sorts} ,</if>
+            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="org_id != null and org_id != ''">#{org_id} ,</if>
+            <if test="companyId != null and companyId != ''">#{companyId} ,</if>
+            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_role a WHERE a.sts = 'Y'
+                ),
+            </if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="" useGeneratedKeys="true">
+        insert into sys_role(id, role_code, role_name, description, sorts, create_user_id, create_time, modify_user_id,
+        modify_time, sts, org_id, company_id, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.id},#{entity.roleCode},#{entity.roleName},#{entity.description},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="" useGeneratedKeys="true">
+        insert into sys_role(id, role_code, role_name, description, sorts, create_user_id, create_time, modify_user_id,
+        modify_time, sts, org_id, company_id)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.id},#{entity.roleCode},#{entity.roleName},#{entity.description},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
+        </foreach>
+        on duplicate key update
+        id = values(id),
+        role_code = values(role_code),
+        role_name = values(role_name),
+        description = values(description),
+        sorts = values(sorts),
+        create_user_id = values(create_user_id),
+        create_time = values(create_time),
+        modify_user_id = values(modify_user_id),
+        modify_time = values(modify_time),
+        sts = values(sts),
+        org_id = values(org_id),
+        company_id = values(company_id)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update" parameterType="com.hzya.frame.sys.role.entity.SysRoleEntity">
+        update sys_role set
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">id = #{id},</if>
+            <if test="roleCode != null and roleCode != ''">role_code = #{roleCode},</if>
+            <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
+            <if test="description != null and description != ''">description = #{description},</if>
+            <if test="sorts != null">sorts = #{sorts},</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+            <if test="org_id != null and org_id != ''">org_id = #{org_id},</if>
+            <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
+        </trim>
+        where = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete" parameterType="com.hzya.frame.sys.role.entity.SysRoleEntity">
 update sys_role  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where  = #{}
+where  = #{id}
 </update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.role.entity.SysRoleEntity" >
-update sys_role  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
- <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="roleCode != null and roleCode != ''"> and role_code = #{roleCode} </if>
-            <if test="roleName != null and roleName != ''"> and role_name = #{roleName} </if>
-            <if test="description != null and description != ''"> and description = #{description} </if>
-            <if test="sorts != null"> and sorts = #{sorts} </if>
-                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-                         <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition" parameterType="com.hzya.frame.sys.role.entity.SysRoleEntity">
+        update sys_role set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="roleCode != null and roleCode != ''">and role_code = #{roleCode}</if>
+            <if test="roleName != null and roleName != ''">and role_name = #{roleName}</if>
+            <if test="description != null and description != ''">and description = #{description}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
             and sts='Y'
-    </trim>
-</update>
-<!--通过主键删除-->
-<delete id="entity_delete">
-    delete from sys_role where  = #{}
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+    delete from sys_role where  = #{id}
 </delete>
 
 </mapper>