From 2c9458726368b46bb2ad66ac05a433aec9d76110 Mon Sep 17 00:00:00 2001 From: Ricky Date: Wed, 21 Apr 2021 09:53:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96ExcelUtil=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 15612b9a..f13b8664 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 @@ -541,7 +541,10 @@ public class ExcelUtil } else if (ColumnType.NUMERIC == attr.cellType()) { - cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); + if (StringUtils.isNotNull(value)) + { + cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); + } } else if (ColumnType.IMAGE == attr.cellType()) { From 3f07632cd45ca998ab9360abe52ea38bcf9f24ba Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 21 Apr 2021 15:14:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=BA=A7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8C=85=E5=B1=91=E6=98=BE=E7=A4=BA=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 d7618816..23fcebbb 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 @@ -160,6 +160,7 @@ public class SysMenuServiceImpl implements ISysMenuService } else if (isMenuFrame(menu)) { + router.setMeta(null); List childrenList = new ArrayList(); RouterVo children = new RouterVo(); children.setPath(menu.getPath()); From 62081aebb9030d53a168d24e825800c613a4303a Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 21 Apr 2021 16:34:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=90=AFTopNav?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=B7=A6=E4=BE=A7=E6=89=93=E5=BC=80=E5=A4=96?= =?UTF-8?q?=E9=93=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/TopNav/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue index 6f7b6882..d89930a8 100644 --- a/ruoyi-ui/src/components/TopNav/index.vue +++ b/ruoyi-ui/src/components/TopNav/index.vue @@ -73,7 +73,9 @@ export default { 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 @@ export default { // 菜单选择事件 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 @@ export default { this.$store.commit("SET_SIDEBAR_ROUTERS", routes); } return routes; + }, + ishttp(url) { + return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1 } }, }; From 251547e79e3be035864d1cc0a11ed9c56f7b25d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Sun, 25 Apr 2021 09:19:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20=E9=87=8D=E5=86=99MP=E6=B3=A8?= =?UTF-8?q?=E5=85=A5=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateAndUpdateMetaObjectHandler.java | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-) 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 7c0922e3..4797a64b 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 org.apache.ibatis.reflection.MetaObject; 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; - } }