公用逻辑修改

esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java

@@ -53,7 +53,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
             //删除标识
             setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpdcDelFlagEnum.NORMAL.value(), metaObject);
             // 数据权限标志
-            setFieldValByName(DEPT_ID, deptId, metaObject);
+            setInsertFieldValByName(DEPT_ID, deptId, metaObject);
         } else {
             if (user == null) {
                 return;

renren-cloud-generator/src/main/resources/template/Entity.java.vm

@@ -42,7 +42,7 @@ public class ${className}Entity extends BaseEpdcEntity {
 	private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.columnName != 'ID' && $column.columnName != 'CREATED_TIME' && $column.columnName != 'CREATED_BY' && $column.columnName != 'UPDATED_TIME' && $column.columnName != 'UPDATED_BY' && $column.columnName != 'DEL_FLAG')
+#if($column.columnName != 'ID' && $column.columnName != 'CREATED_TIME' && $column.columnName != 'CREATED_BY' && $column.columnName != 'UPDATED_TIME' && $column.columnName != 'UPDATED_BY' && $column.columnName != 'DEL_FLAG' && $column.columnName != 'REVISION')
     /**
      * $column.comments
      */

renren-cloud-generator/src/main/resources/template/ServiceImpl.java.vm

@@ -19,7 +19,6 @@ package ${package}.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import ${main}.commons.mybatis.enums.EpdcDelFlagEnum;
 import ${main}.commons.mybatis.service.impl.BaseServiceImpl;
 import ${main}.commons.tools.page.PageData;
 import ${main}.commons.tools.utils.ConvertUtils;
@@ -70,8 +69,7 @@ public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<${className}Entity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
-                .eq(FieldConstant.DEL_FLAG, EpdcDelFlagEnum.NORMAL.value());
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
@@ -99,9 +97,7 @@ public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
-        //逻辑删除
-        //logicDelete(ids, ${className}Entity.class);
-        //物理删除
+        // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }