Merge branch 'dev' into pre-production

blade-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java

@@ -58,7 +58,7 @@ public class QRCodeUtil {
 	public static String getEmpAutograph(String filePath) {
 		log.info("文件转换base64... {}",filePath);
 		String img = null;
-		if (StringUtils.isEmpty(filePath)) {
+		if (filePath!=null && !"".equals(filePath)) {
 			InputStream in = null;
 			byte[] picdata = null;
 			try {
@@ -150,7 +150,7 @@ public class QRCodeUtil {
 	 */
 //	OutputStream outputStream,
 	public static void createCodeToOutputStream(String content,  HttpServletResponse response) throws WriterException, IOException {
-		if (StringUtils.isEmpty(content)) {
+		if (content!=null && !"".equals(content)) {
 			return;
 		}
 		content = content.trim();