commit
ae48c160b0
|
@ -513,7 +513,10 @@ public class ExcelUtil<T>
|
||||||
}
|
}
|
||||||
else if (ColumnType.NUMERIC == attr.cellType())
|
else if (ColumnType.NUMERIC == attr.cellType())
|
||||||
{
|
{
|
||||||
cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
|
if (StrUtil.isNotNull(value))
|
||||||
|
{
|
||||||
|
cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (ColumnType.IMAGE == attr.cellType())
|
else if (ColumnType.IMAGE == attr.cellType())
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,49 +7,39 @@ import org.apache.ibatis.reflection.MetaObject;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author woo
|
* MP注入处理器
|
||||||
* @date 2021/3/11
|
* @author Lion Li
|
||||||
|
* @date 2021/4/25
|
||||||
*/
|
*/
|
||||||
public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
|
public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void insertFill(MetaObject metaObject) {
|
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 (createTime == null) {
|
if (metaObject.hasGetter("createBy")) {
|
||||||
createTime = new Date();
|
if (metaObject.getValue("createBy") == null) {
|
||||||
this.setFieldValByName("createTime", createTime, metaObject);
|
this.setFieldValByName("createBy", SecurityUtils.getUsername(), metaObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//endregion
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateFill(MetaObject metaObject) {
|
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 (updateTime == null) {
|
if (metaObject.hasGetter("updateTime")) {
|
||||||
updateTime = new Date();
|
if (metaObject.getValue("updateTime") == null) {
|
||||||
this.setFieldValByName("updateTime", updateTime, metaObject);
|
this.setFieldValByName("updateTime", new Date(), metaObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//endregion
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean openInsertFill() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean openUpdateFill() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 菜单 业务层处理
|
* 菜单 业务层处理
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
@ -142,6 +142,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
||||||
router.setRedirect("noRedirect");
|
router.setRedirect("noRedirect");
|
||||||
router.setChildren(buildMenus(cMenus));
|
router.setChildren(buildMenus(cMenus));
|
||||||
} else if (isMenuFrame(menu)) {
|
} else if (isMenuFrame(menu)) {
|
||||||
|
router.setMeta(null);
|
||||||
List<RouterVo> childrenList = new ArrayList<RouterVo>();
|
List<RouterVo> childrenList = new ArrayList<RouterVo>();
|
||||||
RouterVo children = new RouterVo();
|
RouterVo children = new RouterVo();
|
||||||
children.setPath(menu.getPath());
|
children.setPath(menu.getPath());
|
||||||
|
|
|
@ -73,7 +73,9 @@ export default {
|
||||||
if(router.path === "/") {
|
if(router.path === "/") {
|
||||||
router.children[item].path = "/redirect/" + router.children[item].path;
|
router.children[item].path = "/redirect/" + router.children[item].path;
|
||||||
} else {
|
} 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;
|
router.children[item].parentPath = router.path;
|
||||||
}
|
}
|
||||||
|
@ -122,7 +124,7 @@ export default {
|
||||||
// 菜单选择事件
|
// 菜单选择事件
|
||||||
handleSelect(key, keyPath) {
|
handleSelect(key, keyPath) {
|
||||||
this.currentIndex = key;
|
this.currentIndex = key;
|
||||||
if (key.indexOf("http://") !== -1 || key.indexOf("https://") !== -1) {
|
if (this.ishttp(key)) {
|
||||||
// http(s):// 路径新窗口打开
|
// http(s):// 路径新窗口打开
|
||||||
window.open(key, "_blank");
|
window.open(key, "_blank");
|
||||||
} else if (key.indexOf("/redirect") !== -1) {
|
} else if (key.indexOf("/redirect") !== -1) {
|
||||||
|
@ -147,6 +149,9 @@ export default {
|
||||||
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
|
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
|
||||||
}
|
}
|
||||||
return routes;
|
return routes;
|
||||||
|
},
|
||||||
|
ishttp(url) {
|
||||||
|
return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue