From a7f425b59bdca1b474a8ca6d6dbc23e47e4e8d06 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 4 Sep 2019 15:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E7=94=A8=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/mybatis/handler/FieldMetaObjectHandler.java   | 2 +-
 .../src/main/resources/template/Entity.java.vm            | 2 +-
 .../src/main/resources/template/ServiceImpl.java.vm       | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
index fd54e898c..1a6fbc118 100644
--- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
+++ b/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;
diff --git a/renren-cloud-generator/src/main/resources/template/Entity.java.vm b/renren-cloud-generator/src/main/resources/template/Entity.java.vm
index 78f0b951e..a2407ccb0 100644
--- a/renren-cloud-generator/src/main/resources/template/Entity.java.vm
+++ b/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
      */
diff --git a/renren-cloud-generator/src/main/resources/template/ServiceImpl.java.vm b/renren-cloud-generator/src/main/resources/template/ServiceImpl.java.vm
index 90258609d..e0e34c5a3 100644
--- a/renren-cloud-generator/src/main/resources/template/ServiceImpl.java.vm
+++ b/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));
     }