opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 02:08:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !100 from 抓蛙师/auto-7465549-dev-1634693504990

Browse Source
This commit is contained in:
抓蛙师 2021-10-20 01:31:50 +00:00 committed by Gitee
commit a90d52f5cf
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
View File

@ -42,7 +42,7 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
&& StringUtils.isBlank(baseEntity.getCreateBy())) {
baseEntity.setCreateBy(username);
}
// 当前已登录 且 更信任为空 则填充
// 当前已登录 且 更新人为空 则填充
if (StringUtils.isNotBlank(username)
&& StringUtils.isBlank(baseEntity.getUpdateBy())) {
baseEntity.setUpdateBy(username);
@ -59,14 +59,11 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
Date current = new Date();
// 更新时间为空 则填充
if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
// 更新时间填充(不管为不为空)
baseEntity.setUpdateTime(current);
}
String username = getLoginUsername();
// 当前已登录 且 更信任为空 则填充
if (StringUtils.isNotBlank(username)
&& StringUtils.isBlank(baseEntity.getUpdateBy())) {
// 当前已登录 更新人填充(不管为不为空)
if (StringUtils.isNotBlank(username)) {
baseEntity.setUpdateBy(username);
}
}

2
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -163,7 +163,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"