Merge remote-tracking branch 'origin/master'

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -74,10 +74,10 @@ public class SysUser implements Serializable
     private String avatar;
 
     /** 密码 */
-    @JsonProperty
     private String password;
 
     @JsonIgnore
+    @JsonProperty
     public String getPassword() {
         return password;
     }

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -512,9 +512,12 @@ public class ExcelUtil<T>
             cell.setCellValue(Validator.isNull(value) ? attr.defaultValue() : value + attr.suffix());
         }
         else if (ColumnType.NUMERIC == attr.cellType())
+        {
+            if (Validator.isNotNull(value))
             {
                 cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
             }
+        }
         else if (ColumnType.IMAGE == attr.cellType())
         {
             ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),

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
+ * MP注入处理器
- * @date 2021/3/11
+ * @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);
+		if (metaObject.hasGetter("createTime")) {
-		Object createTime = this.getFieldValByName("createTime", metaObject);
+			if (metaObject.getValue("createTime") == null) {
-		if (createBy == null) {
+				this.setFieldValByName("createTime", new Date(), metaObject);
-			createBy = SecurityUtils.getUsername();
+			}
-			this.setFieldValByName("createBy", createBy, metaObject);
+		}
+		if (metaObject.hasGetter("createBy")) {
+			if (metaObject.getValue("createBy") == null) {
+				this.setFieldValByName("createBy", SecurityUtils.getUsername(), metaObject);
 			}
-		if (createTime == null) {
-			createTime = new Date();
-			this.setFieldValByName("createTime", createTime, metaObject);
 		}
-		//endregion
 	}
 
 	@Override
 	public void updateFill(MetaObject metaObject) {
-		//region 处理修改人信息
+		if (metaObject.hasGetter("updateBy")) {
-		Object updateBy = this.getFieldValByName("updateBy", metaObject);
+			if (metaObject.getValue("updateBy") == null) {
-		Object updateTime = this.getFieldValByName("updateTime", metaObject);
+				this.setFieldValByName("updateBy", SecurityUtils.getUsername(), metaObject);
-		if (updateBy == null) {
+			}
-			updateBy = SecurityUtils.getUsername();
+		}
-			this.setFieldValByName("updateBy", updateBy, metaObject);
+		if (metaObject.hasGetter("updateTime")) {
+			if (metaObject.getValue("updateTime") == null) {
+				this.setFieldValByName("updateTime", new Date(), metaObject);
 			}
-		if (updateTime == null) {
-			updateTime = new Date();
-			this.setFieldValByName("updateTime", updateTime, metaObject);
 		}
-		//endregion
 	}
 
-	@Override
-	public boolean openInsertFill() {
-		return true;
-	}
-
-	@Override
-	public boolean openUpdateFill() {
-		return true;
-	}
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -142,6 +142,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                 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());

ruoyi-ui/src/components/TopNav/index.vue

@@ -73,8 +73,10 @@ export default {
             if(router.path === "/") {
               router.children[item].path = "/redirect/" + router.children[item].path;
             } else {
+			  if(!this.ishttp(router.children[item].path)) {
                 router.children[item].path = router.path + "/" + router.children[item].path;
 			  }
+            }
             router.children[item].parentPath = router.path;
           }
           childrenMenus.push(router.children[item]);
@@ -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
     }
   },
 };