Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/web/ModuleBlockWeb.java

@@ -78,7 +78,10 @@ public class ModuleBlockWeb extends BaseController {
 		if (Global.SYS_TYPE.equals("2")) {
 			List<ModuleBlock> list = page.getList();
 			for (ModuleBlock moduleBlock1: list) {
-				moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+				String mdImg = moduleBlock1.getMdImg();
+				if (mdImg!=null&&!"".equals(mdImg)) {
+					moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+				}
 			}
 		}
 		return getBootstrapData(page);
@@ -98,7 +101,10 @@ public class ModuleBlockWeb extends BaseController {
 		if (Global.SYS_TYPE.equals("2")) {
 			List<ModuleBlock> list = page.getList();
 			for (ModuleBlock moduleBlock1: list) {
-				moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+				String mdImg = moduleBlock1.getMdImg();
+				if (mdImg!=null&&!"".equals(mdImg)) {
+					moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+				}
 			}
 		}
 		return getBootstrapData(page);