From 91c6ae307de58c5fcbf815f92a90295b4246cd51 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 25 四月 2021 10:40:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java | 52 ++++++++++---------------
ruoyi-ui/src/components/TopNav/index.vue | 9 +++-
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 5 ++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 6 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 3 +
5 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 57e46fc..110c548 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -23,7 +23,7 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
@@ -73,11 +73,11 @@
/** 鐢ㄦ埛澶村儚 */
private String avatar;
- /** 瀵嗙爜 */
- @JsonProperty
+ /** 瀵嗙爜 */
private String password;
@JsonIgnore
+ @JsonProperty
public String getPassword() {
return password;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 073ece3..619ec80 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -513,7 +513,10 @@
}
else if (ColumnType.NUMERIC == attr.cellType())
{
- cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+ if (Validator.isNotNull(value))
+ {
+ cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+ }
}
else if (ColumnType.IMAGE == attr.cellType())
{
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
index 7c0922e..4797a64 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -7,49 +7,39 @@
import java.util.Date;
/**
- * @author woo
- * @date 2021/3/11
+ * MP娉ㄥ叆澶勭悊鍣�
+ * @author Lion Li
+ * @date 2021/4/25
*/
public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
@Override
public void insertFill(MetaObject metaObject) {
- //region 澶勭悊鍒涘缓浜轰俊鎭�
- Object createBy = this.getFieldValByName("createBy", metaObject);
- Object createTime = this.getFieldValByName("createTime", metaObject);
- if (createBy == null) {
- createBy = SecurityUtils.getUsername();
- this.setFieldValByName("createBy", createBy, metaObject);
+ //鏍规嵁灞炴�у悕瀛楄缃濉厖鐨勫��
+ if (metaObject.hasGetter("createTime")) {
+ if (metaObject.getValue("createTime") == null) {
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ }
}
- if (createTime == null) {
- createTime = new Date();
- this.setFieldValByName("createTime", createTime, metaObject);
+ if (metaObject.hasGetter("createBy")) {
+ if (metaObject.getValue("createBy") == null) {
+ this.setFieldValByName("createBy", SecurityUtils.getUsername(), metaObject);
+ }
}
- //endregion
}
@Override
public void updateFill(MetaObject metaObject) {
- //region 澶勭悊淇敼浜轰俊鎭�
- Object updateBy = this.getFieldValByName("updateBy", metaObject);
- Object updateTime = this.getFieldValByName("updateTime", metaObject);
- if (updateBy == null) {
- updateBy = SecurityUtils.getUsername();
- this.setFieldValByName("updateBy", updateBy, metaObject);
+ if (metaObject.hasGetter("updateBy")) {
+ if (metaObject.getValue("updateBy") == null) {
+ this.setFieldValByName("updateBy", SecurityUtils.getUsername(), metaObject);
+ }
}
- if (updateTime == null) {
- updateTime = new Date();
- this.setFieldValByName("updateTime", updateTime, metaObject);
+ if (metaObject.hasGetter("updateTime")) {
+ if (metaObject.getValue("updateTime") == null) {
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ }
}
- //endregion
}
- @Override
- public boolean openInsertFill() {
- return true;
- }
-
- @Override
- public boolean openUpdateFill() {
- return true;
- }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index de669b1..6f7cc41 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -25,7 +25,7 @@
/**
* 鑿滃崟 涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
*/
@Service
@@ -142,6 +142,7 @@
router.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus));
} else if (isMenuFrame(menu)) {
+ router.setMeta(null);
List<RouterVo> childrenList = new ArrayList<RouterVo>();
RouterVo children = new RouterVo();
children.setPath(menu.getPath());
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index 6f7b688..d89930a 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -73,7 +73,9 @@
if(router.path === "/") {
router.children[item].path = "/redirect/" + router.children[item].path;
} else {
- router.children[item].path = router.path + "/" + router.children[item].path;
+ if(!this.ishttp(router.children[item].path)) {
+ router.children[item].path = router.path + "/" + router.children[item].path;
+ }
}
router.children[item].parentPath = router.path;
}
@@ -122,7 +124,7 @@
// 鑿滃崟閫夋嫨浜嬩欢
handleSelect(key, keyPath) {
this.currentIndex = key;
- if (key.indexOf("http://") !== -1 || key.indexOf("https://") !== -1) {
+ if (this.ishttp(key)) {
// http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
window.open(key, "_blank");
} else if (key.indexOf("/redirect") !== -1) {
@@ -147,6 +149,9 @@
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
}
return routes;
+ },
+ ishttp(url) {
+ return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
},
};
--
Gitblit v1.9.3