xs 5 年之前
父节点
当前提交
68859b88c0

+ 1 - 1
src/main/java/com/jeeplus/core/persistence/Page.java

@@ -23,7 +23,7 @@ import com.jeeplus.common.utils.CookieUtils;
  * @version 2016-7-2
  * @param <T>
  */
-public class Page<T> implements Serializable {
+public class Page<T>{
 	
 	protected int pageNo = 1; // 当前页码
 	protected int pageSize = Integer.valueOf(Global.getConfig("page.pageSize")); // 页面大小,设置为“-1”表示不进行分页(分页无效)

+ 11 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/web/MaterialProjectController.java

@@ -79,6 +79,15 @@ public class MaterialProjectController extends BaseController {
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(MaterialProject materialProject, HttpServletRequest request, HttpServletResponse response, Model model) {
 		materialProject.setProjectStatus("");
+		MaterialProject materialProject1 = new MaterialProject();
+		materialProject1.setProjectStatus("");
+		materialProject1.setReserveProjectName(materialProject.getReserveProjectName());
+		materialProject1.setProjectName(materialProject.getProjectName());
+		materialProject1.setProjectCode(materialProject.getProjectCode());
+		materialProject1.setReserveCode(materialProject.getReserveCode());
+		materialProject1.setProjectAttribute(materialProject.getProjectAttribute());
+		materialProject1.setProjectDefine(materialProject.getProjectDefine());
+		materialProject1.setProjectBatch(materialProject.getProjectBatch());
 		String strProject = "";
 		if (!materialProject.getReserveProjectName().equals("")){
 			strProject+=materialProject.getReserveProjectName()+",";
@@ -104,9 +113,10 @@ public class MaterialProjectController extends BaseController {
 		String[] split = strProject.split(",");
 		if (split.length>1){
 			materialProject.setProjectStatus("0");
+			materialProject1.setProjectStatus("0");
 		}
 		HttpSession session = request.getSession();
-		session.setAttribute("materialPro",materialProject);
+		session.setAttribute("materialPro",materialProject1);
 		Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response), materialProject);
 		return getBootstrapData(page);
 	}