自定义sql更新无法注入对应字段问题 未修复

build.gradle

@@ -17,7 +17,7 @@ buildscript {
         ehcache_core_version = '2.6.11'
         mysql_connector_version = '5.1.45'
         alidruid_version = '1.1.6'
-        mybatis_plus_version = '2.1.9'
+        mybatis_plus_version = '2.2.0'
         mybatis_plus_boot_version = '1.0.5'
         activiti_starter_version = '6.0.0'
 //        rabbitmq_version = '5.1.2'

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysRoleService.kt

@@ -23,4 +23,16 @@ interface ISysRoleService : BaseService<SysRole> {
      * 查询角色列表 分页 过滤 忽略enable 等
      */
     fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole>
+
+    /**
+     * 修改 角色信息
+     * TODO 通知
+     */
+    fun modify(entity: SysRole): SysRole
+
+    /**
+     * 物理删除
+     * TODO 通知
+     */
+    fun physicalDelete(id: Long)
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDicServiceImpl.kt

@@ -10,8 +10,8 @@ import com.gxzc.zen.common.contants.PLATFORM
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.properties.PlatformProperties
-import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.common.util.PlatformUtil
+import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
@@ -47,7 +47,8 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, C
         if (cached != null) {
             return cached
         }
-        val ret = baseMapper.selectByParams(null)
+//        val ret = baseMapper.selectByParams(null)
+        val ret = baseMapper.selectWOLogic(null)
         if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
             RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, ret)
         }
@@ -55,12 +56,17 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, C
     }
 
     override fun getList(enable: Boolean?): MutableList<SysDic> {
+//        return if (enable != null) {
+//            baseMapper.selectByParams(mutableMapOf(
+//                    "enable" to enable
+//            ))
+//        } else {
+//            baseMapper.selectByParams(null)
+//        }
         return if (enable != null) {
-            baseMapper.selectByParams(mutableMapOf(
-                    "enable" to enable
-            ))
+            baseMapper.selectWOLogic(EntityWrapper<SysDic>().eq("enable", enable))
         } else {
-            baseMapper.selectByParams(null)
+            baseMapper.selectWOLogic(null)
         }
     }
 
@@ -74,7 +80,7 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, C
     @ZenTransactional
     override fun modify(data: SysDic): SysDic {
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            baseMapper.updateNoLogic(data, EntityWrapper<SysDic>().eq("id", data.id))
+            baseMapper.updateWOLogic(data, EntityWrapper<SysDic>().eq("id", data.id))
             // 更新缓存
             val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
             cached?.let {
@@ -89,12 +95,18 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, C
     }
 
     override fun getOneByKey(key: String, value: String?, sort: Int?): SysDic? {
-        val result = baseMapper.selectByParams(mutableMapOf(
-                "key" to key,
-                "value" to value!!,
-                "sort" to sort!!,
-                "enable" to true
-        ))
+//        val result = baseMapper.selectByParams(mutableMapOf(
+//                "key" to key,
+//                "value" to value!!,
+//                "sort" to sort!!,
+//                "enable" to true
+//        ))
+
+        val result = baseMapper.selectWOLogic(EntityWrapper<SysDic>()
+                .eq("key", key)
+                .eq("value", value!!)
+                .eq("sort", sort!!)
+                .eq("enable", true))
         return if (result.size > 0) {
             result.filter {
                 it.sort == sort && it.value == value

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysParamServiceImpl.kt

@@ -10,8 +10,8 @@ import com.gxzc.zen.common.contants.PLATFORM
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.properties.PlatformProperties
-import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.common.util.PlatformUtil
+import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
@@ -47,7 +47,8 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
         if (cached != null) {
             return cached
         }
-        val ret = baseMapper.selectByParams(null)
+//        val ret = baseMapper.selectByParams(null)
+        val ret = baseMapper.selectWOLogic(null)
         if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
             RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, ret)
         }
@@ -55,12 +56,17 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     }
 
     override fun getList(enable: Boolean?): MutableList<SysParam> {
+//        return if (enable != null) {
+//            baseMapper.selectByParams(mutableMapOf(
+//                    "enable" to enable
+//            ))
+//        } else {
+//            baseMapper.selectByParams(null)
+//        }
         return if (enable != null) {
-            baseMapper.selectByParams(mutableMapOf(
-                    "enable" to enable
-            ))
+            baseMapper.selectWOLogic(EntityWrapper<SysParam>().eq("enable", enable))
         } else {
-            baseMapper.selectByParams(null)
+            baseMapper.selectWOLogic(null)
         }
     }
 
@@ -74,7 +80,7 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     @ZenTransactional
     override fun modify(data: SysParam): SysParam {
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            baseMapper.updateNoLogic(data, EntityWrapper<SysParam>().eq("id", data.id))
+            baseMapper.updateWOLogic(data, EntityWrapper<SysParam>().eq("id", data.id))
             // 更新缓存
             val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
             cached?.let {
@@ -89,12 +95,17 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     }
 
     override fun getOneByKey(key: String, value: String?, sort: Int?): SysParam? {
-        val result = baseMapper.selectByParams(mutableMapOf(
-                "key" to key,
-                "value" to value!!,
-                "sort" to sort!!,
-                "enable" to true
-        ))
+//        val result = baseMapper.selectByParams(mutableMapOf(
+//                "key" to key,
+//                "value" to value!!,
+//                "sort" to sort!!,
+//                "enable" to true
+//        ))
+        val result = baseMapper.selectWOLogic(EntityWrapper<SysParam>()
+                .eq("key", key)
+                .eq("value", value!!)
+                .eq("sort", sort!!)
+                .eq("enable", true))
         return if (result.size > 0) {
             result.filter {
                 it.sort == sort && it.value == value

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysRoleServiceImpl.kt

@@ -1,10 +1,14 @@
 package com.gxzc.zen.api.sys.service.impl
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper
 import com.baomidou.mybatisplus.plugins.Page
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysRoleMapper
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.service.ISysRoleService
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
+import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.springframework.stereotype.Service
 
 /**
@@ -19,26 +23,56 @@ import org.springframework.stereotype.Service
 class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {
 
     override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
-        val params: LinkedHashMap<String, Any?> = linkedMapOf(
-                "name" to name,
-                "code" to code?.toUpperCase()
-        )
+        val wrapper = EntityWrapper<SysRole>()
+                .eq("name", name)
+                .eq("code", code?.toUpperCase())
         if (enable != null) {
-            params["enable"] = enable
+            wrapper.eq("enable", enable)
         }
-        return baseMapper.selectByParams(params)
+        return baseMapper.selectWOLogic(wrapper)
+//        val params: LinkedHashMap<String, Any?> = linkedMapOf(
+//                "name" to name,
+//                "code" to code?.toUpperCase()
+//        )
+//        if (enable != null) {
+//            params["enable"] = enable
+//        }
+//        return baseMapper.selectByParams(params)
+
     }
 
     override fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole> {
         val page = Page<SysRole>(current, size)
-        val params: LinkedHashMap<String, Any?> = linkedMapOf(
-                "name" to name,
-                "code" to code?.toUpperCase()
-        )
+
+        val wrapper = EntityWrapper<SysRole>()
+                .eq("name", name)
+                .eq("code", code?.toUpperCase())
         if (enable != null) {
-            params["enable"] = enable
+            wrapper.eq("enable", enable)
         }
-        page.records = baseMapper.selectByParamsPage(page, params)
+        page.records = baseMapper.selectWOLogicPage(page, wrapper)
+//        val params: LinkedHashMap<String, Any?> = linkedMapOf(
+//                "name" to name,
+//                "code" to code?.toUpperCase()
+//        )
+//        if (enable != null) {
+//            params["enable"] = enable
+//        }
+//        page.records = baseMapper.selectByParamsPage(page, params)
         return page
     }
+
+    @ZenTransactional
+    override fun modify(entity: SysRole): SysRole {
+//        baseMapper.updateById(entity)
+        baseMapper.updateWOLogic(entity, EntityWrapper<SysRole>().eq("id", entity.id))
+        return entity
+    }
+
+    @ZenTransactional
+    override fun physicalDelete(id: Long) {
+        if (baseMapper.physicalDeleteById(id) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        }
+    }
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysUserServiceImpl.kt

@@ -47,7 +47,8 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
         if (cached != null) {
             return cached
         }
-        val ret = baseMapper.selectByParams(null)
+//        val ret = baseMapper.selectByParams(null)
+        val ret = baseMapper.selectWOLogic(null)
         if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
             RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, ret)
         }
@@ -83,7 +84,7 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
     @ZenTransactional
     override fun modify(entity: SysUser): SysUser {
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            baseMapper.updateNoLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
+            baseMapper.updateWOLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
             // 更新缓存
             val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
             cached?.let {

zen-api/src/main/resources/mapping/sys/SysRoleMapper.xml

@@ -42,6 +42,45 @@
         </where>
     </sql>
 
+    <sql id="dynamicSqlSet">
+        <set>
+            <if test="et.name != null">
+                `name` = #{et.name},
+            </if>
+            <if test="et.code != null">
+                code = #{et.code},
+            </if>
+            <if test="et.perms != null">
+                perms = #{et.perms},
+            </if>
+            <if test="et.createTime != null">
+                create_time = #{et.createTime},
+            </if>
+            <if test="et.createBy != null">
+                create_by = #{et.createBy},
+            </if>
+            <if test="et.updateTime != null">
+                update_time = #{et.updateTime},
+            </if>
+            <if test="et.updateBy != null">
+                update_by = #{et.updateBy},
+            </if>
+            <if test="et.remark != null">
+                remark = #{et.remark},
+            </if>
+            <if test="et.enable != null">
+                <choose>
+                    <when test="et.enable == true">
+                        `enable` = 1
+                    </when>
+                    <otherwise>
+                        `enable` = 0
+                    </otherwise>
+                </choose>
+            </if>
+        </set>
+    </sql>
+
     <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysRole">
         SELECT *
         FROM sys_role
@@ -56,4 +95,19 @@
         ORDER BY id
     </select>
 
+    <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysRole">
+        UPDATE sys_role
+        <include refid="dynamicSqlSet"/>
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </update>
+
+    <delete id="physicalDelete">
+        DELETE FROM sys_role
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </delete>
+
 </mapper>

zen-core/src/main/kotlin/com/gxzc/zen/common/base/BaseMapper.kt

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.mapper.BaseMapper
 import com.baomidou.mybatisplus.mapper.Wrapper
 import com.baomidou.mybatisplus.plugins.pagination.Pagination
 import org.apache.ibatis.annotations.Param
+import java.io.Serializable
 
 /**
  * 通用的DAO
  * 提供一些通用的特殊查询方法(除了Mybatis-plus提供的自动crud)
- * 对应的Mapper.xml方法要自己写入
  * @author NorthLan
  * @date 2018/1/24
  * @url https://noahlan.com
@@ -16,22 +16,32 @@ import org.apache.ibatis.annotations.Param
 interface BaseMapper<T> : BaseMapper<T> {
     /**
      * 通过自定义SQL查询
+     * 忽略 全局 逻辑删除
      */
-    fun selectByParams(@Param("p") params: MutableMap<String, Any?>?): MutableList<T>
+    fun selectWOLogic(@Param("ew") wrapper: Wrapper<T>?): MutableList<T>
 
     /**
      * 自定义SQL查询 分页
+     * 忽略 全局 逻辑删除
      */
-    fun selectByParamsPage(page: Pagination, @Param("p") params: LinkedHashMap<String, Any?>?): MutableList<T>
+    fun selectWOLogicPage(page: Pagination, @Param("ew") wrapper: Wrapper<T>?): MutableList<T>
 
     /**
-     * 自定义更新逻辑(忽略mp自带的逻辑删除功能)
-     * 一般更新enable字段时使用
+     * 自定义更新逻辑 更新enable字段时使用
+     * 忽略 全局 逻辑删除
+     * 自动生成sql,无需在xml中写入sql
      */
-    fun updateNoLogic(@Param("et") entity: T, @Param("ew") wrapper: Wrapper<T>): Long
+    fun updateWOLogic(@Param("et") entity: T, @Param("ew") wrapper: Wrapper<T>): Long
 
     /**
      * 物理删除
+     * 自动生成sql,无需在xml中写入sql
      */
     fun physicalDelete(@Param("ew") wrapper: Wrapper<T>): Long
+
+    /**
+     * 物理删除 By ID
+     * 自动生成sql,无需在xml中写入sql
+     */
+    fun physicalDeleteById(id: Serializable): Long
 }

zen-core/src/main/kotlin/com/gxzc/zen/common/base/BaseModel.kt

@@ -22,20 +22,20 @@ open class BaseModel : Serializable {
     var id: Long? = null
 
     // 创建时间
-    @TableField(fill = FieldFill.INSERT, strategy = FieldStrategy.NOT_NULL)
+    @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(hidden = true)
     var createTime: Date? = null
 
     // 创建人id
-    @TableField(fill = FieldFill.INSERT, strategy = FieldStrategy.NOT_NULL)
+    @TableField(fill = FieldFill.INSERT)
     var createBy: String? = null
 
     // 更新时间
-    @TableField(fill = FieldFill.UPDATE, strategy = FieldStrategy.NOT_NULL)
+    @TableField(fill = FieldFill.UPDATE)
     var updateTime: Date? = null
 
     // 更新人id
-    @TableField(fill = FieldFill.UPDATE, strategy = FieldStrategy.NOT_NULL)
+    @TableField(fill = FieldFill.UPDATE)
     var updateBy: String? = null
 
     // 备注

zen-core/src/main/kotlin/com/gxzc/zen/common/util/PaginationUtil.kt

@@ -62,7 +62,7 @@ object PaginationUtil {
      * }
      */
     fun <T> logicPaging(data: MutableList<T>, current: Int?, size: Int?): Pagination {
-        return Page<T>(current!!, size!!).setRecords(logicPagingList(data, current, size)).setTotal(data.size)
+        return Page<T>(current!!, size!!).setRecords(logicPagingList(data, current, size)).setTotal(data.size.toLong())
     }
 
     fun <T> logicPaging(data: MutableList<T>, request: HttpServletRequest): Pagination {

zen-orm/src/main/kotlin/com/gxzc/zen/orm/aop/DataSourceSwitchAspect.kt

@@ -102,7 +102,7 @@ class DataSourceSwitchAspect {
                 .filter { it.pkgName in packageName }
                 .forEach {
                     setDataSource(method, it.dsKey)
-                    logger.debug("setDataSource: {}", it.dsKey)
+                    logger.trace("setDataSource: {}", it.dsKey)
                 }
     }
 

zen-orm/src/main/kotlin/com/gxzc/zen/orm/aop/MultiTransactionAspect.kt

@@ -36,7 +36,7 @@ class MultiTransactionAspect {
      */
     @Around("@annotation(com.gxzc.zen.orm.annotation.ZenTransactional)")
     fun multiTransactionAround(joinPoint: ProceedingJoinPoint): Any? {
-        logger.info("@ZenTransactional aspect...")
+        logger.trace("@ZenTransactional aspect...")
         val methodName = joinPoint.signature.name
         val parameterTypes = (joinPoint.signature as MethodSignature).method.parameterTypes
         val method = joinPoint.target::class.java.getMethod(methodName, *parameterTypes)

zen-orm/src/main/kotlin/com/gxzc/zen/orm/sql/ZenSqlInjector.kt

@@ -0,0 +1,93 @@
+package com.gxzc.zen.orm.sql
+
+import com.baomidou.mybatisplus.entity.TableInfo
+import com.baomidou.mybatisplus.mapper.LogicSqlInjector
+import com.baomidou.mybatisplus.toolkit.StringUtils
+import org.apache.ibatis.builder.MapperBuilderAssistant
+import org.apache.ibatis.session.Configuration
+import org.springframework.stereotype.Component
+
+
+/**
+ * 自定义 injector 继承自 LogicSqlInjector 同时实现逻辑删注入
+ * 为几个公共自定义方法提供 sql 构建
+ *
+ * updateWOLogic
+ * physicalDelete
+ *
+ * @author NorthLan
+ * @date 2018/3/30
+ * @url https://noahlan.com
+ */
+@Component
+class ZenSqlInjector : LogicSqlInjector() {
+
+    override fun inject(configuration: Configuration, builderAssistant: MapperBuilderAssistant, mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
+        super.inject(configuration, builderAssistant, mapperClass, modelClass, table)
+        this.updateWOLogic(mapperClass, modelClass, table)
+        this.physicalDeleteById(mapperClass, modelClass, table)
+        this.physicalDelete(mapperClass, modelClass, table)
+        this.selectWOLogic(mapperClass, modelClass, table)
+        this.selectWOLogicPage(mapperClass, modelClass, table)
+    }
+
+    fun updateWOLogic(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
+        val sqlMethod = "updateWOLogic"
+        val sql = "<script>UPDATE ${table.tableName} ${sqlSet(true, table, "et.")} ${sqlWhereEntityWrapper(table)}</script>"
+        val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
+        this.addUpdateMappedStatement(mapperClass, modelClass, sqlMethod, sqlSource)
+    }
+
+    fun physicalDeleteById(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
+        val sqlMethod = "physicalDeleteById"
+        val sql = "<script>DELETE FROM ${table.tableName} WHERE ${table.keyColumn} = #{${table.keyProperty}}</script>"
+        val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
+        this.addDeleteMappedStatement(mapperClass, sqlMethod, sqlSource)
+    }
+
+    fun physicalDelete(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
+        val sqlMethod = "physicalDelete"
+        val sql = "<script>DELETE FROM ${table.tableName} ${sqlWhereEntityWrapper(table)}</script>"
+        val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
+        this.addDeleteMappedStatement(mapperClass, sqlMethod, sqlSource)
+    }
+
+    fun selectWOLogic(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
+        val sqlMethod = "selectWOLogic"
+        val sql = "SELECT ${sqlSelectColumns(table, false)} FROM ${table.tableName} ${sqlWhereEntityWrapper(table)}"
+        val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
+        this.addSelectMappedStatement(mapperClass, sqlMethod, sqlSource, modelClass, table)
+    }
+
+    fun selectWOLogicPage(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
+        val sqlMethod = "selectWOLogicPage"
+        val sql = "SELECT ${sqlSelectColumns(table, false)} FROM ${table.tableName} ${sqlWhereEntityWrapper(table)}"
+        val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
+        this.addSelectMappedStatement(mapperClass, sqlMethod, sqlSource, modelClass, table)
+    }
+
+    override fun sqlWhereEntityWrapper(table: TableInfo): String {
+        val where = StringBuilder(128)
+        where.append("\n<where>")
+        where.append("\n<if test=\"ew!=null\">")
+        where.append("\n<if test=\"ew.entity!=null\">")
+        if (StringUtils.isNotEmpty(table.keyProperty)) {
+            where.append("\n<if test=\"ew.entity.").append(table.keyProperty).append("!=null\">\n")
+            where.append(table.keyColumn).append("=#{ew.entity.").append(table.keyProperty).append("}")
+            where.append("\n</if>")
+        }
+        val fieldList = table.fieldList
+        for (fieldInfo in fieldList) {
+            where.append(convertIfTag(fieldInfo, "ew.entity.", false))
+            where.append(" AND ").append(this.sqlCondition(fieldInfo.condition,
+                    fieldInfo.column, "ew.entity." + fieldInfo.el))
+            where.append(convertIfTag(fieldInfo, true))
+        }
+        where.append("\n</if>")
+        where.append("\n<if test=\"ew!=null and ew.sqlSegment!=null and ew.notEmptyOfWhere\">\n\${ew.sqlSegment}\n</if>")
+        where.append("\n</if>")
+        where.append("\n</where>")
+        where.append("\n<if test=\"ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere\">\n\${ew.sqlSegment}\n</if>")
+        return where.toString()
+    }
+}

zen-web/src/main/kotlin/com/gxzc/zen/orm/CustomMetaObjectHandler.kt

@@ -33,9 +33,7 @@ class CustomMetaObjectHandler : MetaObjectHandler() {
     override fun updateFill(metaObject: MetaObject?) {
         val curUser = SSOUtil.getCurUser()
         logger.debug("公共字段自动填充: updateFill ${curUser?.account}")
-        if (getFieldValByName("updateBy", metaObject) == null) {
-            setFieldValByName("updateBy", curUser?.account, metaObject)
-        }
+        setFieldValByName("updateBy", curUser?.account, metaObject)
         setFieldValByName("updateTime", Date(), metaObject)
     }
 }

zen-web/src/main/kotlin/com/gxzc/zen/web/sys/controller/RoleController.kt

@@ -9,10 +9,8 @@ import com.gxzc.zen.common.util.PaginationUtil
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
+import java.net.URI
 
 /**
  * 角色 控制器
@@ -66,4 +64,34 @@ class RoleController : BaseController() {
         }
         return ResponseEntity.ok(ResponseDto().apply { data = result })
     }
+
+    @GetMapping("{id}")
+    @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
+    fun getById(@PathVariable id: Long): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = roleService.selectById(id)
+        })
+    }
+
+    @PutMapping
+    @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
+    fun putDic(@RequestBody data: SysRole): ResponseEntity<*> {
+        return if (data.id == null) {
+            // insert
+            roleService.insert(data)
+            ResponseEntity.created(URI.create("/sys/dic/${data.id}")).body(ResponseDto()) // 201
+        } else {
+            // update
+            ResponseEntity.ok(ResponseDto().apply {
+                this.data = roleService.modify(data) // 200
+            })
+        }
+    }
+
+    @DeleteMapping("{id}")
+    fun deleteDic(@PathVariable id: Long): ResponseEntity<*> {
+        // 物理删除数据
+        roleService.physicalDelete(id)
+        return ResponseEntity.ok(ResponseDto())
+    }
 }

zen-web/src/main/resources/application-orm.yml

@@ -62,14 +62,14 @@ datasource:
 ###################  mybatis-plus配置  ###################
 mybatis-plus:
   mapper-locations: classpath*:mapping/**/*.xml
-  type-aliases-package: com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.sys.mapper,com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.bus.mapper
+  type-aliases-package: com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.sys.mapper
   global-config:
     id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
     db-column-underline: true
     refresh-mapper: true
     logic-delete-value: 0
     logic-not-delete-value: 1
-    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+    sql-injector: com.gxzc.zen.orm.sql.ZenSqlInjector # 自定义injector
     meta-object-handler: com.gxzc.zen.orm.CustomMetaObjectHandler
   configuration:
     map-underscore-to-camel-case: true