github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
zhuangqian 2016-12-19 13:45:10 +08:00
parent a9bca897d2
commit 9e30ee3e2d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/smallchill/core/beetl/tag/SideBarTag.java
View File

@ -21,6 +21,8 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.smallchill.core.toolbox.kit.StrKit;
import com.smallchill.core.toolbox.support.Convert;
import org.beetl.core.Tag; import org.beetl.core.Tag;
import com.smallchill.common.vo.TreeNode; import com.smallchill.common.vo.TreeNode;
@ -91,8 +93,8 @@ public class SideBarTag extends Tag {
if (Func.toInt(side.get("LEVELS")) == 1) { if (Func.toInt(side.get("LEVELS")) == 1) {
String firstMenu = ""; String firstMenu = "";
String subMenu = ""; String subMenu = "";
String href = Func.isEmpty(side.get("URL")) ? "#" : ctxPath + side.get("URL") + ""; String href = StrKit.isBlank(Convert.toStr(side.get("URL"), "").trim()) ? "#" : ctxPath + side.get("URL") + "";
String addtabs = Func.isEmpty(side.get("URL")) ? "" : "data-addtabs=\"" + side.get("CODE") + "\""; String addtabs = StrKit.isBlank(Convert.toStr(side.get("URL"), "").trim()) ? "" : "data-addtabs=\"" + side.get("CODE") + "\"";
firstMenu += "<li >"; firstMenu += "<li >";
firstMenu += " <a data-url=\"" + href + "\" " + addtabs + " data-title=\"" + side.get("NAME") + "\" data-icon=\"fa " + side.get("ICON") + "\" class=\"" + getDropDownClass(Func.toStr(side.get("CODE")),"dropdown-toggle") + " blade-pointer\">"; firstMenu += " <a data-url=\"" + href + "\" " + addtabs + " data-title=\"" + side.get("NAME") + "\" data-icon=\"fa " + side.get("ICON") + "\" class=\"" + getDropDownClass(Func.toStr(side.get("CODE")),"dropdown-toggle") + " blade-pointer\">";
@ -144,12 +146,12 @@ public class SideBarTag extends Tag {
* 菜单集合 * 菜单集合
* @param pCode * @param pCode
* 父编号 * 父编号
* @param menuCode
* 选中菜单编号
* @param pStr * @param pStr
* 父HTML * 父HTML
* @param levels * @param levels
* 层级 * 层级
* @param ctxPath
* ctxPath
* @return String 返回子菜单HTML集 * @return String 返回子菜单HTML集
*/ */
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@ -165,8 +167,8 @@ public class SideBarTag extends Tag {
String _icon = rd.getStr("ICON"); String _icon = rd.getStr("ICON");
String _name = rd.getStr("NAME"); String _name = rd.getStr("NAME");
if ((_pCode.equals(pCode) && _levels > levels)) { if ((_pCode.equals(pCode) && _levels > levels)) {
String href = Func.isEmpty(_url) ? "#" : ctxPath + _url + ""; String href = StrKit.isBlank(_url.trim()) ? "#" : ctxPath + _url + "";
String addtabs = Func.isEmpty(_url) ? "" : "data-addtabs=\"" + _code + "\""; String addtabs = StrKit.isBlank(_url.trim()) ? "" : "data-addtabs=\"" + _code + "\"";
Str += "<li>"; Str += "<li>";
Str += " <a data-url=\"" + href + "\" " + addtabs + " data-title=\"" + _name + "\" data-icon=\"fa " + _icon + "\" class=\"" + getDropDownClass(_code, "dropdown-toggle") + " blade-pointer\">"; Str += " <a data-url=\"" + href + "\" " + addtabs + " data-title=\"" + _name + "\" data-icon=\"fa " + _icon + "\" class=\"" + getDropDownClass(_code, "dropdown-toggle") + " blade-pointer\">";

15
src/main/java/com/smallchill/core/toolbox/support/Convert.java
View File

@ -36,6 +36,13 @@ public class Convert {
*/ */
public static Object parse(Class<?> clazz, Object value) { public static Object parse(Class<?> clazz, Object value) {
try { try {
if (clazz.isAssignableFrom(String.class)) {
// ----2016-12-19---zhuangqian----防止beetlsql对空字符串不检测导致无法入库的问题----
if (StrKit.isBlank(String.valueOf(value)))
return " ";
else
return String.valueOf(value);
}
return clazz.cast(value); return clazz.cast(value);
} catch (ClassCastException e) { } catch (ClassCastException e) {
String valueStr = String.valueOf(value); String valueStr = String.valueOf(value);
@ -77,14 +84,6 @@ public class Convert {
return null; return null;
} }
if (clazz.isAssignableFrom(String.class)) {
// ----2016-12-01---zhuangqian----防止beetlsql对空字符串不检测导致无法入库的问题----
if (StrKit.isBlank(valueStr))
return " ";
else
return valueStr;
}
if (StrKit.isBlank(valueStr)) return null; if (StrKit.isBlank(valueStr)) return null;
BasicType basicType = null; BasicType basicType = null;