修改

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/util/ImportPro.java

@@ -52,6 +52,27 @@ public class ImportPro {
         }
         return list;
     }
+    public static List<MaterialProvided> getFlagMaterial(List<MaterialProvided> materProUtil){
+        boolean flag = false;
+        List<MaterialProvided> materialProvideds = new ArrayList<MaterialProvided>();
+        for (MaterialProvided materialProvided:materialProvideds){
+            flag = true;
+            if (null!=materialProvideds && materialProvideds.size()>0){
+                for (MaterialProvided material:materialProvideds){
+                    if (material.getMaterialCode().equals(materialProvided.getMaterialCode())){
+                        if (material.getMaterialDescription().equals(materialProvided.getExtendedDescription())){
+                            flag = false;
+                        }
+                    }
+                }
+            }
+            if (flag){
+                materialProvideds.add(materialProvided);
+            }
+        }
+        return materialProvideds;
+    }
+
     /*
         验证
      */

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

@@ -128,10 +128,10 @@ public class ModuleBlockWeb extends BaseController {
 		if (Global.SYS_TYPE.equals("2")) {
 			List<ModuleBlock> list = page.getList();
 			for (ModuleBlock moduleBlock1: list) {
-				String mdImg = moduleBlock1.getMdImg();
-				if (mdImg!=null&&!"".equals(mdImg)) {
-					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);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -356,7 +356,7 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:import")
     @RequestMapping(value = "import")
-   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws Exception{
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
 		AjaxJson j = new AjaxJson();
 		//获取登录名
 		User userByLoginName = systemService.getUserByLoginName(UserUtils.getUser().getLoginName());