Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-common/common-core/src/main/java/com/ym/mec/common/dal/CustomEnumTypeHandler.java

@@ -5,6 +5,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 
@@ -45,13 +46,16 @@ public class CustomEnumTypeHandler extends BaseTypeHandler<BaseEnum> {
 	}
 
 	public BaseEnum convert(Object name) {
+		if (name == null || StringUtils.isBlank(name.toString())) {
+			return null;
+		}
 		Object code = null;
 		for (BaseEnum enumBaseInterface : type.getEnumConstants()) {
 
 			code = enumBaseInterface.getCode();
 
 			if (code instanceof Integer) {
-				if ((int)code == Integer.parseInt(name.toString())) {
+				if ((int) code == Integer.parseInt(name.toString())) {
 					return enumBaseInterface;
 				}
 			} else {