Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/persistence/DataEntity.java

@@ -32,6 +32,8 @@ public abstract class DataEntity<T> extends BaseEntity<T> {
 	protected transient String delFlag; 	// 删除标记（0：正常；1：删除；2：审核）
 	protected transient String uploadMode = Global.getConfig("remoteServer.uploadMode");
 
+	protected transient String toflag; 	// 判定是否从列表进行查询
+
 	public DataEntity() {
 		super();
 		this.delFlag = DEL_FLAG_NORMAL;
@@ -133,4 +135,12 @@ public abstract class DataEntity<T> extends BaseEntity<T> {
 	public void setUploadMode(String uploadMode) {
 		this.uploadMode = uploadMode;
 	}
+
+	public String getToflag() {
+		return toflag;
+	}
+
+	public void setToflag(String toflag) {
+		this.toflag = toflag;
+	}
 }

src/main/java/com/jeeplus/modules/feedback/web/QuestionFeedbackController.java

@@ -80,6 +80,19 @@ public class QuestionFeedbackController extends BaseController {
 	 */
 	@RequestMapping(value = {"list", ""})
 	public String list(QuestionFeedback questionFeedback, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes redirectAttributes) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(questionFeedback.getToflag())){
+			if (questionFeedback.getToflag().equals("1")){
+				request.getSession().removeAttribute("searchFeedback");
+				QuestionFeedback search=questionFeedback;
+				request.getSession().setAttribute("searchFeedback",search);
+			}
+		}else{
+			if (request.getSession().getAttribute("searchFeedback")!=null){
+				questionFeedback= (QuestionFeedback) request.getSession().getAttribute("searchFeedback");
+				model.addAttribute("questionFeedback", questionFeedback);
+			}
+		}
 		Page<QuestionFeedback> page = feedbackService.findPage(new Page<QuestionFeedback>(request, response), questionFeedback);
 		model.addAttribute("page", page);
 		return "modules/feedback/feedbackList";

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -21,6 +21,7 @@ import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.pushinfo.service.PushinfoService;
 import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.entity.SysRoleActivity;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.SystemService;
@@ -28,6 +29,7 @@ import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -84,6 +86,17 @@ public class OaNotifyController extends BaseController {
 	//我的通告（未过期）
 	@RequestMapping(value = {"self"})
 	public String listMyself(OaNotify oaNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(oaNotify.getToflag())){
+			request.getSession().removeAttribute("searchlistMyself");
+			OaNotify search=oaNotify;
+			request.getSession().setAttribute("searchlistMyself",search);
+		}else{
+			if (request.getSession().getAttribute("searchlistMyself")!=null){
+				oaNotify= (OaNotify) request.getSession().getAttribute("searchlistMyself");
+				model.addAttribute("oaNotify", oaNotify);
+			}
+		}
 		oaNotify.setSelf(true);
 		Page<OaNotify> page = oaNotifyService.findUnreadMyself(new Page<OaNotify>(request, response), oaNotify);
 		List<OaNotify> list = page.getList();
@@ -98,6 +111,17 @@ public class OaNotifyController extends BaseController {
 	//我的公告（已过期）
 	@RequestMapping(value = {"readSelf"})
 	public String listReadMyself(OaNotify oaNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(oaNotify.getToflag())){
+			request.getSession().removeAttribute("searchlistReadMyself");
+			OaNotify search=oaNotify;
+			request.getSession().setAttribute("searchlistReadMyself",search);
+		}else{
+			if (request.getSession().getAttribute("searchlistReadMyself")!=null){
+				oaNotify= (OaNotify) request.getSession().getAttribute("searchlistReadMyself");
+				model.addAttribute("oaNotify", oaNotify);
+			}
+		}
 		oaNotify.setSelf(true);
 		Page<OaNotify> page = oaNotifyService.findReadMyself(new Page<OaNotify>(request, response), oaNotify);
 		List<OaNotify> list = page.getList();
@@ -113,6 +137,19 @@ public class OaNotifyController extends BaseController {
 	@RequiresPermissions("oa:oaNotify:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(OaNotify oaNotify, HttpServletRequest request, HttpServletResponse response, Model model,RedirectAttributes redirectAttributes) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(oaNotify.getToflag())){
+			if (oaNotify.getToflag().equals("1")){
+				request.getSession().removeAttribute("searchOaNotify");
+				OaNotify search=oaNotify;
+				request.getSession().setAttribute("searchOaNotify",search);
+			}
+		}else{
+			if (request.getSession().getAttribute("searchOaNotify")!=null){
+				oaNotify= (OaNotify) request.getSession().getAttribute("searchOaNotify");
+				model.addAttribute("oaNotify", oaNotify);
+			}
+		}
 		User user = UserUtils.getUser();
 		/*if(!UserUtils.isManager()){
 			addMessage(redirectAttributes,"您在本公司非管理员，只能查看'我的通告'");

src/main/java/com/jeeplus/modules/projectAccessory/web/CollectAccessoryController.java

@@ -4,6 +4,7 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.feedback.entity.QuestionFeedback;
 import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
 import com.jeeplus.modules.projectAccessory.service.CollectAccessoryService;
 import com.jeeplus.modules.sys.entity.Workattachment;
@@ -54,6 +55,19 @@ public class CollectAccessoryController extends BaseController {
     @RequiresPermissions("collectAccessory:collectAccessory:list")
     @RequestMapping(value = {"list", ""})
     public String list(CollectAccessoryInfo collectAccessoryInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(collectAccessoryInfo.getToflag())){
+            if (collectAccessoryInfo.getToflag().equals("1")){
+                request.getSession().removeAttribute("searchAccessoryInfo");
+                CollectAccessoryInfo search=collectAccessoryInfo;
+                request.getSession().setAttribute("searchAccessoryInfo",search);
+            }
+        }else{
+            if (request.getSession().getAttribute("searchAccessoryInfo")!=null){
+                collectAccessoryInfo= (CollectAccessoryInfo) request.getSession().getAttribute("searchAccessoryInfo");
+                model.addAttribute("collectAccessoryInfo", collectAccessoryInfo);
+            }
+        }
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
@@ -72,6 +86,19 @@ public class CollectAccessoryController extends BaseController {
      */
     @RequestMapping(value = {"officeList"})
     public String officeList(CollectAccessoryInfo collectAccessoryInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(collectAccessoryInfo.getToflag())){
+            if (collectAccessoryInfo.getToflag().equals("1")){
+                request.getSession().removeAttribute("searchAccessoryOffice");
+                CollectAccessoryInfo search=collectAccessoryInfo;
+                request.getSession().setAttribute("searchAccessoryOffice",search);
+            }
+        }else{
+            if (request.getSession().getAttribute("searchAccessoryOffice")!=null){
+                collectAccessoryInfo= (CollectAccessoryInfo) request.getSession().getAttribute("searchAccessoryOffice");
+                model.addAttribute("collectAccessoryInfo", collectAccessoryInfo);
+            }
+        }
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
@@ -90,6 +117,19 @@ public class CollectAccessoryController extends BaseController {
      */
     @RequestMapping(value = {"companyList"})
     public String companyList(CollectAccessoryInfo collectAccessoryInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(collectAccessoryInfo.getToflag())){
+            if (collectAccessoryInfo.getToflag().equals("1")){
+                request.getSession().removeAttribute("searchAccessoryCompany");
+                CollectAccessoryInfo search=collectAccessoryInfo;
+                request.getSession().setAttribute("searchAccessoryCompany",search);
+            }
+        }else{
+            if (request.getSession().getAttribute("searchAccessoryCompany")!=null){
+                collectAccessoryInfo= (CollectAccessoryInfo) request.getSession().getAttribute("searchAccessoryCompany");
+                model.addAttribute("collectAccessoryInfo", collectAccessoryInfo);
+            }
+        }
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }

src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryRelationController.java

@@ -21,6 +21,8 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 /**
@@ -58,7 +60,18 @@ public class ProjectAccessoryRelationController extends BaseController {
 	 */
 	@RequiresPermissions("projectAccessoryRelation:projectAccessoryRelation:list")
 	@RequestMapping(value = {"list", ""})
-	public String list(ProjectAccessoryRelationInfo projectAccessoryRelationInfo,Model model) {
+	public String list(ProjectAccessoryRelationInfo projectAccessoryRelationInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(projectAccessoryRelationInfo.getToflag())){
+			request.getSession().removeAttribute("searchProjectAccessoryRelationInfo");
+			ProjectAccessoryRelationInfo search=projectAccessoryRelationInfo;
+			request.getSession().setAttribute("searchProjectAccessoryRelationInfo",search);
+		}else{
+			if (request.getSession().getAttribute("searchProjectAccessoryRelationInfo")!=null){
+				projectAccessoryRelationInfo= (ProjectAccessoryRelationInfo) request.getSession().getAttribute("searchProjectAccessoryRelationInfo");
+				model.addAttribute("projectAccessoryRelationInfo", projectAccessoryRelationInfo);
+			}
+		}
 		model.addAttribute("projectAccessoryRelationInfo",projectAccessoryRelationInfo);
 		model.addAttribute("attachmentProjectType",projectAccessoryRelationInfo.getAttachmentProjectType());
 		model.addAttribute("attachmentProjectSortStr",projectAccessoryRelationInfo.getAttachmentProjectSort());

src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectTemplateController.java

@@ -17,6 +17,7 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectBasedData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import org.apache.shiro.authz.annotation.Logical;
@@ -65,7 +66,18 @@ public class ProjectTemplateController extends BaseController {
 	 */
 	@RequiresPermissions("projectTemplate:projectTemplate:list")
 	@RequestMapping(value = {"list", ""})
-	public String list(ProjectTemplateInfo projectTemplateInfo, Model model) {
+	public String list(ProjectTemplateInfo projectTemplateInfo,HttpServletRequest request,HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(projectTemplateInfo.getToflag())){
+			request.getSession().removeAttribute("searchProjectTemplateInfo");
+			ProjectTemplateInfo search=projectTemplateInfo;
+			request.getSession().setAttribute("searchProjectTemplateInfo",search);
+		}else{
+			if (request.getSession().getAttribute("searchProjectTemplateInfo")!=null){
+				projectTemplateInfo= (ProjectTemplateInfo) request.getSession().getAttribute("searchProjectTemplateInfo");
+				model.addAttribute("projectTemplateInfo", projectTemplateInfo);
+			}
+		}
 		List<ProjectTemplateInfo> list = projectTemplateService.findList(projectTemplateInfo);
 		model.addAttribute("list", list);
 		return "modules/projectAccessory/projectTemplate/projectTemplateList";

src/main/java/com/jeeplus/modules/projectEngineering/web/ProjectEngineeringController.java

@@ -4,6 +4,7 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
@@ -18,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -50,7 +53,18 @@ public class ProjectEngineeringController  extends BaseController {
      */
     @RequiresPermissions("projectEngineering:projectEngineering:list")
     @RequestMapping(value = {"list", ""})
-    public String list(ProjectEngineeringInfo projectEngineeringInfo, Model model) {
+    public String list(ProjectEngineeringInfo projectEngineeringInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectEngineeringInfo.getToflag())){
+            request.getSession().removeAttribute("searchProjectEngineeringInfo");
+            ProjectEngineeringInfo search=projectEngineeringInfo;
+            request.getSession().setAttribute("searchProjectEngineeringInfo",search);
+        }else{
+            if (request.getSession().getAttribute("searchProjectEngineeringInfo")!=null){
+                projectEngineeringInfo= (ProjectEngineeringInfo) request.getSession().getAttribute("searchProjectEngineeringInfo");
+                model.addAttribute("projectEngineeringInfo", projectEngineeringInfo);
+            }
+        }
         List<ProjectEngineeringInfo> list = engineeringService.findList(projectEngineeringInfo);
         model.addAttribute("list", list);
         model.addAttribute("projectengineeringInfo", projectEngineeringInfo);
@@ -65,6 +79,7 @@ public class ProjectEngineeringController  extends BaseController {
     @RequiresPermissions(value={"projectEngineering:projectEngineering:add","projectEngineering:projectEngineering:edit"},logical= Logical.OR)
     @RequestMapping(value = "form")
     public String form(ProjectEngineeringInfo projectEngineeringInfo, Model model) {
+
         //获取所有父级工程类型
         List<ProjectEngineeringInfo> parentInfos=engineeringService.getParentInfo();
         model.addAttribute("parentInfos", parentInfos);

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -81,6 +81,17 @@ public class ProjectFilingBatchController extends BaseController {
         if (UserUtils.isManager()) {
             model.addAttribute("flag", "1");
         }
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectGuidang.getToflag())){
+            request.getSession().removeAttribute("searchProjectFilingBatch");
+            ProjectFilingBatch search=projectGuidang;
+            request.getSession().setAttribute("searchProjectFilingBatch",search);
+        }else{
+            if (request.getSession().getAttribute("searchProjectFilingBatch")!=null){
+                projectGuidang= (ProjectFilingBatch) request.getSession().getAttribute("searchProjectFilingBatch");
+                model.addAttribute("projectFilingBatch", projectGuidang);
+            }
+        }
         if(StringUtils.isNotBlank(projectGuidang.getCreateId())){
             User selectUser = UserUtils.get(projectGuidang.getCreateId());
             model.addAttribute("createName", selectUser.getName());

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanConsultingController.java

@@ -77,6 +77,17 @@ public class ProjectPlanConsultingController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectRecords.getToflag())){
+            request.getSession().removeAttribute("searchRuralProjectRecordPlan");
+            RuralProjectRecords search=projectRecords;
+            request.getSession().setAttribute("searchRuralProjectRecordPlan",search);
+        }else{
+            if (request.getSession().getAttribute("searchRuralProjectRecordPlan")!=null){
+                projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchRuralProjectRecordPlan");
+                model.addAttribute("ruralProjectRecords", projectRecords);
+            }
+        }
         projectRecords.setProjectStatus(5);
 
         List<String> typeList = Lists.newArrayList();

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanCostController.java

@@ -19,6 +19,7 @@ import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -74,6 +75,19 @@ public class ProjectPlanCostController extends BaseController {
     @RequiresPermissions("project:projectPlanCost:list")
     @RequestMapping(value = {"list", ""})
     public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectRecords.getToflag())){
+            if (projectRecords.getToflag().equals("1")){
+                request.getSession().removeAttribute("searchprojectRecordsPlan");
+                RuralProjectRecords search=projectRecords;
+                request.getSession().setAttribute("searchprojectRecordsPlan",search);
+            }
+        }else{
+            if (request.getSession().getAttribute("searchprojectRecordsPlan")!=null){
+                projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchprojectRecordsPlan");
+                model.addAttribute("ruralProjectRecords", projectRecords);
+            }
+        }
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -126,6 +126,19 @@ public class RuralCostProjectMessageController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectRecords.getToflag())){
+            if (projectRecords.getToflag().equals("1")){
+                request.getSession().removeAttribute("searchprojectRecordsList");
+                RuralProjectRecords search=projectRecords;
+                request.getSession().setAttribute("searchprojectRecordsList",search);
+            }
+        }else{
+            if (request.getSession().getAttribute("searchprojectRecordsList")!=null){
+                projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchprojectRecordsList");
+                model.addAttribute("ruralProjectRecords", projectRecords);
+            }
+        }
         //添加查询类型(造价审核)
         projectRecords.setProjectType("2");
         Page<RuralProjectRecords> page = ruralProjectMessageService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -113,7 +113,20 @@ public class RuralCostProjectRecordsController extends BaseController {
 	@RequiresPermissions("ruralProject:ruralCostProjectRecords:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
-        if(UserUtils.isManager()){
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(projectRecords.getToflag())){
+			if (projectRecords.getToflag().equals("1")){
+				request.getSession().removeAttribute("searchProjectRecord");
+				RuralProjectRecords search=projectRecords;
+				request.getSession().setAttribute("searchProjectRecord",search);
+			}
+		}else{
+			if (request.getSession().getAttribute("searchProjectRecord")!=null){
+				projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchProjectRecord");
+				model.addAttribute("ruralProjectRecords", projectRecords);
+			}
+		}
+		if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
         //添加查询类型(造价审核)

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java

@@ -87,6 +87,17 @@ public class RuralProjectMessageAllController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectRecords.getToflag())){
+            request.getSession().removeAttribute("searchRuralProjectRecordsAll");
+            RuralProjectRecords search=projectRecords;
+            request.getSession().setAttribute("searchRuralProjectRecordsAll",search);
+        }else{
+            if (request.getSession().getAttribute("searchRuralProjectRecordsAll")!=null){
+                projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchRuralProjectRecordsAll");
+                model.addAttribute("ruralProjectRecords", projectRecords);
+            }
+        }
         //添加查询类型(工程咨询)
         List<String> typeList = Lists.newArrayList();
         typeList.add("1");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -141,6 +141,17 @@ public class RuralProjectMessageController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectRecords.getToflag())){
+            request.getSession().removeAttribute("searchRuralProjectRecordList");
+            RuralProjectRecords search=projectRecords;
+            request.getSession().setAttribute("searchRuralProjectRecordList",search);
+        }else{
+            if (request.getSession().getAttribute("searchRuralProjectRecordList")!=null){
+                projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchRuralProjectRecordList");
+                model.addAttribute("ruralProjectRecords", projectRecords);
+            }
+        }
         //添加查询类型(工程咨询)
         projectRecords.setProjectType("1");
         Page<RuralProjectRecords> page = ruralProjectMessageService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordChooseCheckAllController.java

@@ -88,6 +88,17 @@ public class RuralProjectRecordChooseCheckAllController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectRecords.getToflag())){
+            request.getSession().removeAttribute("searchrecordChooseCheckAll");
+            RuralProjectRecords search=projectRecords;
+            request.getSession().setAttribute("searchrecordChooseCheckAll",search);
+        }else{
+            if (request.getSession().getAttribute("searchrecordChooseCheckAll")!=null){
+                projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchrecordChooseCheckAll");
+                model.addAttribute("ruralProjectRecords", projectRecords);
+            }
+        }
         List<String> typeList = Lists.newArrayList();
         typeList.add("1");
         typeList.add("2");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordChooseCheckController.java

@@ -7,6 +7,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
@@ -96,6 +97,17 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(projectRecords.getToflag())){
+            request.getSession().removeAttribute("searchrecordChooseCheck");
+            RuralProjectRecords search=projectRecords;
+            request.getSession().setAttribute("searchrecordChooseCheck",search);
+        }else{
+            if (request.getSession().getAttribute("searchrecordChooseCheck")!=null){
+                projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchrecordChooseCheck");
+                model.addAttribute("ruralProjectRecords", projectRecords);
+            }
+        }
         List<String> typeList = Lists.newArrayList();
         typeList.add("1");
         typeList.add("2");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -30,10 +30,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
-import com.jeeplus.modules.sys.entity.MainDictDetail;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.Role;
-import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.entity.Activity;
@@ -46,6 +43,7 @@ import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
+import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
@@ -121,6 +119,17 @@ public class RuralProjectRecordsController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(projectRecords.getToflag())){
+			request.getSession().removeAttribute("searchRuralProjectRecord");
+			RuralProjectRecords search=projectRecords;
+			request.getSession().setAttribute("searchRuralProjectRecord",search);
+		}else{
+			if (request.getSession().getAttribute("searchRuralProjectRecord")!=null){
+				projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchRuralProjectRecord");
+				model.addAttribute("ruralProjectRecords", projectRecords);
+			}
+		}
         //添加查询类型(工程咨询)
 		projectRecords.setProjectType("1");
         //获取项目信息
@@ -945,6 +954,17 @@ public class RuralProjectRecordsController extends BaseController {
 	 */
 	@RequestMapping(value = "listShow")
 	public String listShow(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(projectRecords.getToflag())){
+			request.getSession().removeAttribute("searchlistShow");
+			RuralProjectRecords search=projectRecords;
+			request.getSession().setAttribute("searchlistShow",search);
+		}else{
+			if (request.getSession().getAttribute("searchlistShow")!=null){
+				projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchlistShow");
+				model.addAttribute("ruralProjectRecords", projectRecords);
+			}
+		}
 		//获取项目信息
 		Page<RuralProjectRecords> page = projectRecordsService.listShow(new Page<RuralProjectRecords>(request, response), projectRecords);
 		//无合同状态下，获取委托方的名称
@@ -976,6 +996,17 @@ public class RuralProjectRecordsController extends BaseController {
 	 */
 	@RequestMapping(value = "finishListShow")
 	public String finishListShow(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(projectRecords.getToflag())){
+			request.getSession().removeAttribute("searchfinishListShow");
+			RuralProjectRecords search=projectRecords;
+			request.getSession().setAttribute("searchfinishListShow",search);
+		}else{
+			if (request.getSession().getAttribute("searchfinishListShow")!=null){
+				projectRecords= (RuralProjectRecords) request.getSession().getAttribute("searchfinishListShow");
+				model.addAttribute("ruralProjectRecords", projectRecords);
+			}
+		}
 		//获取项目信息
 		Page<RuralProjectRecords> page = projectRecordsService.finishListShow(new Page<RuralProjectRecords>(request, response), projectRecords);
 		//无合同状态下，获取委托方的名称

src/main/java/com/jeeplus/modules/serialnum/web/SerialNumTplController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
 
+import com.jeeplus.modules.sys.entity.SysRoleActivity;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -65,6 +66,17 @@ public class SerialNumTplController extends BaseController {
 	@RequiresPermissions("serialnum:serialNumTpl:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(SerialNumTpl serialNumTpl, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(serialNumTpl.getToflag())){
+			request.getSession().removeAttribute("searchSerialNumTpl");
+			SerialNumTpl search=serialNumTpl;
+			request.getSession().setAttribute("searchSerialNumTpl",search);
+		}else{
+			if (request.getSession().getAttribute("searchSerialNumTpl")!=null){
+				serialNumTpl= (SerialNumTpl) request.getSession().getAttribute("searchSerialNumTpl");
+				model.addAttribute("serialNumTpl", serialNumTpl);
+			}
+		}
 		Page<SerialNumTpl> page = serialNumTplService.findPage(new Page<SerialNumTpl>(request, response), serialNumTpl);
 		model.addAttribute("page", page);
 		return "modules/serialnum/serialNumTplList";

src/main/java/com/jeeplus/modules/sys/web/DictController.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.jeeplus.modules.sys.entity.SysRoleActivity;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,17 @@ public class DictController extends BaseController {
 	@RequiresPermissions("sys:dict:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(Dict dict, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(dict.getToflag())){
+			request.getSession().removeAttribute("searchDict");
+			Dict search=dict;
+			request.getSession().setAttribute("searchDict",search);
+		}else{
+			if (request.getSession().getAttribute("searchDict")!=null){
+				dict= (Dict) request.getSession().getAttribute("searchDict");
+				model.addAttribute("dict", dict);
+			}
+		}
 		List<String> typeList = dictService.findTypeList();
 		model.addAttribute("typeList", typeList);
         Page<Dict> page = dictService.findPage(new Page<Dict>(request, response), dict); 

src/main/java/com/jeeplus/modules/sys/web/MainDictController.java

@@ -69,6 +69,17 @@ public class MainDictController extends BaseController {
 	@RequiresPermissions("sys:mainDict:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(MainDict mainDict, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(mainDict.getToflag())){
+			request.getSession().removeAttribute("searchMainDict");
+			MainDict search=mainDict;
+			request.getSession().setAttribute("searchMainDict",search);
+		}else{
+			if (request.getSession().getAttribute("searchMainDict")!=null){
+				mainDict= (MainDict) request.getSession().getAttribute("searchMainDict");
+				model.addAttribute("mainDict", mainDict);
+			}
+		}
 		String company=request.getParameter("company");
         User user = UserUtils.getUser();
         boolean admin = user.isAdmin();

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpSession;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
 import com.jeeplus.modules.sys.dao.CompanyDao;
 import com.jeeplus.modules.sys.dao.OfficeDao;
 import com.jeeplus.modules.sys.dao.RoleDao;
@@ -87,7 +88,20 @@ public class OfficeController extends BaseController {
 
     @RequiresPermissions("sys:office:index")
     @RequestMapping(value = {"list",""})
-    public String index(Office office, Model model) {
+    public String index(Office office, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(office.getToflag())){
+            request.getSession().removeAttribute("searchoffice");
+            Office search=office;
+            request.getSession().setAttribute("searchoffice",search);
+        }else{
+            if (request.getSession().getAttribute("searchoffice")!=null){
+                office= (Office) request.getSession().getAttribute("searchoffice");
+                model.addAttribute("office", office);
+            }
+        }
+
+
         User user=UserUtils.get(UserUtils.getUser().getId());
 
         List<Office> offices = new ArrayList<>();

src/main/java/com/jeeplus/modules/sys/web/RoleController.java

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.modules.sys.dao.RoleDao;
-import com.jeeplus.modules.sys.entity.Menu;
+import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
 import com.sun.org.apache.bcel.internal.generic.I2F;
@@ -35,9 +35,6 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.Collections3;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.Role;
-import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.SystemService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -76,6 +73,7 @@ public class RoleController extends BaseController {
 	@RequiresPermissions("sys:role:index")
 	@RequestMapping(value = {""})
 	public String index(Role role, Model model) {
+
 		return "modules/sys/roleIndex";
 	}
 
@@ -84,6 +82,16 @@ public class RoleController extends BaseController {
 	public String list(Role role, Model model, HttpServletRequest request, HttpServletResponse response) {
 		//role.setCompany(UserUtils.getSelectCompany());
 		//List<Role> list = systemService.findAllRole();
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(role.getToflag())){
+			request.getSession().removeAttribute("searchRole");
+			Role search=role;
+			request.getSession().setAttribute("searchRole",search);
+		}else{
+			if (request.getSession().getAttribute("searchRole")!=null){
+				role= (Role) request.getSession().getAttribute("searchRole");
+			}
+		}
 		User user = UserUtils.getUser();
 		if(!user.getId().equals("1")){
 			role.setCompany(UserUtils.getSelectCompany());

src/main/java/com/jeeplus/modules/sys/web/SysRoleActivityController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
 
+import com.jeeplus.modules.sys.entity.User;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +64,17 @@ public class SysRoleActivityController extends BaseController {
 	@RequiresPermissions("sys:sysroleactivity:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(SysRoleActivity sysRoleActivity, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(sysRoleActivity.getToflag())){
+			request.getSession().removeAttribute("searchRoleActivity");
+			SysRoleActivity search=sysRoleActivity;
+			request.getSession().setAttribute("searchRoleActivity",search);
+		}else{
+			if (request.getSession().getAttribute("searchRoleActivity")!=null){
+				sysRoleActivity= (SysRoleActivity) request.getSession().getAttribute("searchRoleActivity");
+				model.addAttribute("sysRoleActivity", sysRoleActivity);
+			}
+		}
 		Page<SysRoleActivity> page = sysRoleActivityService.findPage(new Page<SysRoleActivity>(request, response), sysRoleActivity);
 		model.addAttribute("page", page);
 		return "modules/sys/sysroleactivityList";

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -101,6 +101,17 @@ public class UserController extends BaseController {
     @RequiresPermissions("sys:user:index")
     @RequestMapping(value = {"list", ""})
     public String index(User user, HttpServletRequest request, HttpServletResponse response, Model model,RedirectAttributes attr) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(user.getToflag())){
+            request.getSession().removeAttribute("searchuser");
+            User search=user;
+            request.getSession().setAttribute("searchuser",search);
+        }else{
+            if (request.getSession().getAttribute("searchuser")!=null){
+                user= (User) request.getSession().getAttribute("searchuser");
+                model.addAttribute("user", user);
+            }
+        }
         if (user.getOffice()!=null && StringUtils.isNotBlank(user.getOffice().getId()) && StringUtils.isBlank(user.getOffice().getName())){
             Office office = officeService.get(user.getOffice().getId());
             user.setOffice(office);

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -32,6 +32,7 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workreimbursement.utils.VarStr;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,7 +86,19 @@ public class WorkClientInfoController extends BaseController {
 	@RequiresPermissions("workclientinfo:workClientInfo:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkClientInfo workClientInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
-
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workClientInfo.getToflag())){
+			if (workClientInfo.getToflag().equals("1")){
+				request.getSession().removeAttribute("searchClientInfo");
+				WorkClientInfo search=workClientInfo;
+				request.getSession().setAttribute("searchClientInfo",search);
+			}
+		}else{
+			if (request.getSession().getAttribute("searchClientInfo")!=null){
+				workClientInfo= (WorkClientInfo) request.getSession().getAttribute("searchClientInfo");
+				model.addAttribute("workClientInfo", workClientInfo);
+			}
+		}
 		if(StringUtils.isNotBlank(workClientInfo.getCreateNameStr())){
 			model.addAttribute("createName", workClientInfo.getCreateNameStr());
 		}
@@ -204,9 +217,9 @@ public class WorkClientInfoController extends BaseController {
 //					   @RequestParam(value = "upload_files") MultipartFile[] upload_files.
                        HttpServletRequest request
                         ) throws Exception{
-		if (!beanValidator(model, workClientInfo)){
-			return form(workClientInfo, model);
-		}
+//		if (!beanValidator(model, workClientInfo)){
+//			return form(workClientInfo, model);
+//		}
 
 		//保存当前人的公司
 		workClientInfo.setCompanyId(UserUtils.getSelectCompany().getId());

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoAllController.java

@@ -60,6 +60,20 @@ public class WorkContractInfoAllController extends BaseController {
     @RequiresPermissions("workcontractinfo:workContractInfo:list")
     @RequestMapping(value = {"list", ""})
     public String list(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(workContractInfo.getToflag())){
+            if (workContractInfo.getToflag().equals("1")){
+                request.getSession().removeAttribute("searchContractInfoAll");
+                WorkContractInfo search=workContractInfo;
+                request.getSession().setAttribute("searchContractInfoAll",search);
+            }
+        }else{
+            if (request.getSession().getAttribute("searchContractInfoAll")!=null){
+                workContractInfo= (WorkContractInfo) request.getSession().getAttribute("searchContractInfoAll");
+                model.addAttribute("workContractInfo", workContractInfo);
+            }
+        }
+
         User user = UserUtils.getUser();
         Page<WorkContractInfo> page = workContractInfoAllService.findPage(new Page<WorkContractInfo>(request, response), workContractInfo);
         List<WorkContractInfo> list = page.getList();

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -137,6 +137,19 @@ public class WorkContractInfoController extends BaseController {
     @RequiresPermissions("workcontractinfo:workContractInfo:list")
     @RequestMapping(value = {"list", ""})
     public String list(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(workContractInfo.getToflag())){
+            if (workContractInfo.getToflag().equals("1")){
+                request.getSession().removeAttribute("searchContractInfo");
+                WorkContractInfo search=workContractInfo;
+                request.getSession().setAttribute("searchContractInfo",search);
+            }
+        }else{
+            if (request.getSession().getAttribute("searchContractInfo")!=null){
+                workContractInfo= (WorkContractInfo) request.getSession().getAttribute("searchContractInfo");
+                model.addAttribute("workContractInfo", workContractInfo);
+            }
+        }
         User user = UserUtils.getUser();
         //只是普通员工
        /* if(!UserUtils.getSelectRoleInfo()){

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -133,6 +133,17 @@ public class WorkInvoiceAllController extends BaseController {
 	@RequiresPermissions("workinvoice:workInvoiceAll:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workInvoice.getToflag())){
+			request.getSession().removeAttribute("searchInvoiceAll");
+			WorkInvoice searchInvoice=workInvoice;
+			request.getSession().setAttribute("searchInvoiceAll",searchInvoice);
+		}else{
+			if (request.getSession().getAttribute("searchInvoiceAll")!=null){
+				workInvoice= (WorkInvoice) request.getSession().getAttribute("searchInvoiceAll");
+				model.addAttribute("workInvoice", workInvoice);
+			}
+		}
 		Page<WorkInvoice> page = workInvoiceService.findPage(new Page<WorkInvoice>(request, response), workInvoice);
 		//查询已通过的所有发票的开票金额总和
 		String getSumMoney = workInvoiceService.getSumMoney(workInvoice);

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -136,6 +136,18 @@ public class WorkInvoiceController extends BaseController {
 	@RequiresPermissions("workinvoice:workInvoice:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workInvoice.getToflag())){
+			if (workInvoice.getToflag().equals("1")){
+				request.getSession().removeAttribute("searchInvoice");
+				WorkInvoice searchInvoice=workInvoice;
+				request.getSession().setAttribute("searchInvoice",searchInvoice);
+			}
+		}else{
+			if (request.getSession().getAttribute("searchInvoice")!=null){
+				workInvoice= (WorkInvoice) request.getSession().getAttribute("searchInvoice");
+			}
+		}
 		//判断对账人是否为空，为空则赋值为null 防止查找为空的数据
 		if(StringUtils.isBlank(workInvoice.getAccountCheckingUserId())){
 			workInvoice.setAccountCheckingUserId(null);

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -499,6 +499,17 @@ public class WorkProjectNotifyController extends BaseController {
 	 */
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workProjectNotify.getToflag())){
+			request.getSession().removeAttribute("searchWorkProjectNotifylist");
+			WorkProjectNotify search=workProjectNotify;
+			request.getSession().setAttribute("searchWorkProjectNotifylist",search);
+		}else{
+			if (request.getSession().getAttribute("searchWorkProjectNotifylist")!=null){
+				workProjectNotify= (WorkProjectNotify) request.getSession().getAttribute("searchWorkProjectNotifylist");
+				model.addAttribute("workProjectNotify", workProjectNotify);
+			}
+		}
 		User user = UserUtils.getUser();
 		workProjectNotify.setUser(user);
 		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
@@ -528,6 +539,17 @@ public class WorkProjectNotifyController extends BaseController {
 	 */
 	@RequestMapping(value = {"backlogListReadShow"})
 	public String backlogListReadShow(WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workProjectNotify.getToflag())){
+			request.getSession().removeAttribute("searchbacklogListReadShow");
+			WorkProjectNotify search=workProjectNotify;
+			request.getSession().setAttribute("searchbacklogListReadShow",search);
+		}else{
+			if (request.getSession().getAttribute("searchbacklogListReadShow")!=null){
+				workProjectNotify= (WorkProjectNotify) request.getSession().getAttribute("searchbacklogListReadShow");
+				model.addAttribute("workProjectNotify", workProjectNotify);
+			}
+		}
 		User user = UserUtils.getUser();
 		workProjectNotify.setUser(user);
 		workProjectNotify.setStatus("2");
@@ -544,6 +566,17 @@ public class WorkProjectNotifyController extends BaseController {
 	 */
 	@RequestMapping(value = {"backlogListByMine"})
 	public String backlogListByMine(WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workProjectNotify.getToflag())){
+			request.getSession().removeAttribute("searchbacklogListByMine");
+			WorkProjectNotify search=workProjectNotify;
+			request.getSession().setAttribute("searchbacklogListByMine",search);
+		}else{
+			if (request.getSession().getAttribute("searchbacklogListByMine")!=null){
+				workProjectNotify= (WorkProjectNotify) request.getSession().getAttribute("searchbacklogListByMine");
+				model.addAttribute("workProjectNotify", workProjectNotify);
+			}
+		}
 		User user = UserUtils.getUser();
 		workProjectNotify.setUser(user);
 		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
@@ -956,6 +989,17 @@ public class WorkProjectNotifyController extends BaseController {
 	 */
 	@RequestMapping(value = {"listShow"})
 	public String listShow(WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workProjectNotify.getToflag())){
+			request.getSession().removeAttribute("searchWorkProjectNotify");
+			WorkProjectNotify search=workProjectNotify;
+			request.getSession().setAttribute("searchWorkProjectNotify",search);
+		}else{
+			if (request.getSession().getAttribute("searchWorkProjectNotify")!=null){
+				workProjectNotify= (WorkProjectNotify) request.getSession().getAttribute("searchWorkProjectNotify");
+				model.addAttribute("workProjectNotify", workProjectNotify);
+			}
+		}
 		User user = UserUtils.getUser();
 		workProjectNotify.setUser(user);
 		workProjectNotify.setStatus("0");
@@ -1010,6 +1054,17 @@ public class WorkProjectNotifyController extends BaseController {
 	 */
 	@RequestMapping(value = {"listReadShow"})
 	public String listReadShow(WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workProjectNotify.getToflag())){
+			request.getSession().removeAttribute("searchlistReadShow");
+			WorkProjectNotify search=workProjectNotify;
+			request.getSession().setAttribute("searchlistReadShow",search);
+		}else{
+			if (request.getSession().getAttribute("searchlistReadShow")!=null){
+				workProjectNotify= (WorkProjectNotify) request.getSession().getAttribute("searchlistReadShow");
+				model.addAttribute("workProjectNotify", workProjectNotify);
+			}
+		}
 		User user = UserUtils.getUser();
 		workProjectNotify.setUser(user);
 		workProjectNotify.setStatus("2");

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementAllController.java

@@ -36,6 +36,7 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workfullmanage.service.WorkFullManageService;
+import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
 import com.jeeplus.modules.workreimbursement.entity.WorkAccount;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
@@ -140,6 +141,17 @@ public class WorkReimbursementAllController extends BaseController {
 	@RequiresPermissions("workreimbursement:workReimbursementAll:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkReimbursement workReimbursement, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workReimbursement.getToflag())){
+			request.getSession().removeAttribute("searchReimbursement");
+			WorkReimbursement searchInvoice=workReimbursement;
+			request.getSession().setAttribute("searchReimbursement",searchInvoice);
+		}else{
+			if (request.getSession().getAttribute("searchReimbursement")!=null){
+				workReimbursement= (WorkReimbursement) request.getSession().getAttribute("searchReimbursement");
+				model.addAttribute("workReimbursement", workReimbursement);
+			}
+		}
 		//workReimbursement.setOfficeId(UserUtils.getSelectOffice().getId());
 		Page<WorkReimbursement> page = workReimbursementService.findPage(new Page<WorkReimbursement>(request, response), workReimbursement);
 		model.addAttribute("page", page);

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -143,6 +143,17 @@ public class WorkReimbursementController extends BaseController {
 	@RequiresPermissions("workreimbursement:workReimbursement:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkReimbursement workReimbursement, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workReimbursement.getToflag())){
+			request.getSession().removeAttribute("searchReimbursement");
+			WorkReimbursement search=workReimbursement;
+			request.getSession().setAttribute("searchReimbursement",search);
+		}else{
+			if (request.getSession().getAttribute("searchReimbursement")!=null){
+				workReimbursement= (WorkReimbursement) request.getSession().getAttribute("searchReimbursement");
+				model.addAttribute("workReimbursement", workReimbursement);
+			}
+		}
 		//workReimbursement.setOfficeId(UserUtils.getSelectOffice().getId());
 		Page<WorkReimbursement> page = workReimbursementService.findPage(new Page<WorkReimbursement>(request, response), workReimbursement);
 		List<WorkReimbursement> list = page.getList();
@@ -270,6 +281,11 @@ public class WorkReimbursementController extends BaseController {
 				workReimbursement.setAchivesId(UserUtils.getBasicInfo().getId());
 			}
 		}
+		if (StringUtils.isNotBlank(workReimbursement.getCreateBy().getId())){
+			User user=UserUtils.get(workReimbursement.getCreateBy().getId());
+			workReimbursement.setCreateBy(user);
+		}
+
 		model.addAttribute("workReimbursement", workReimbursement);
 		return "modules/workreimbursement/"+view;
 	}

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementTypeController.java

@@ -6,6 +6,7 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementTypeService;
 import org.apache.shiro.authz.annotation.Logical;
@@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -55,7 +58,18 @@ public class WorkReimbursementTypeController extends BaseController {
      */
     @RequiresPermissions("reimbursementType:reimbursementType:list")
     @RequestMapping(value = {"list", ""})
-    public String list(WorkReimbursementTypeInfo workReimbursementTypeInfo, Model model) {
+    public String list(WorkReimbursementTypeInfo workReimbursementTypeInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(workReimbursementTypeInfo.getToflag())){
+            request.getSession().removeAttribute("searchReimbursementTypeInfo");
+            WorkReimbursementTypeInfo searchInvoice=workReimbursementTypeInfo;
+            request.getSession().setAttribute("searchReimbursementTypeInfo",searchInvoice);
+        }else{
+            if (request.getSession().getAttribute("searchReimbursementTypeInfo")!=null){
+                workReimbursementTypeInfo= (WorkReimbursementTypeInfo) request.getSession().getAttribute("searchReimbursementTypeInfo");
+                model.addAttribute("workReimbursementTypeInfo", workReimbursementTypeInfo);
+            }
+        }
         List<WorkReimbursementTypeInfo> list = workReimbursementTypeService.findList(workReimbursementTypeInfo);
         workReimbursementTypeService.queryProofread(list);
         model.addAttribute("list", list);

src/main/java/com/jeeplus/modules/workstaff/web/QualificationsController.java

@@ -108,6 +108,19 @@ public class QualificationsController extends BaseController {
 	@RequiresPermissions("qualifications:qualifications:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getToflag())){
+			if (workStaffBasicInfo.getToflag().equals("1")){
+				request.getSession().removeAttribute("searchQualification");
+				WorkStaffBasicInfo search=workStaffBasicInfo;
+				request.getSession().setAttribute("searchQualification",search);
+			}
+		}else{
+			if (request.getSession().getAttribute("searchQualification")!=null){
+				workStaffBasicInfo= (WorkStaffBasicInfo) request.getSession().getAttribute("searchQualification");
+				model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+			}
+		}
 		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
 		List<WorkStaffBasicInfo> list = page.getList();
 		model.addAttribute("page", page);

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -16,6 +16,7 @@ import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
@@ -107,6 +108,19 @@ public class WorkStaffBasicInfoController extends BaseController {
 	@RequiresPermissions("workstaff:workStaffBasicInfo:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//进行查询之后进行任何操作，返回还是查询之后的数据页面
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getToflag())){
+			if (workStaffBasicInfo.getToflag().equals("1")){
+				request.getSession().removeAttribute("searchStaffBasicInfo");
+				WorkStaffBasicInfo search=workStaffBasicInfo;
+				request.getSession().setAttribute("searchStaffBasicInfo",search);
+			}
+		}else{
+			if (request.getSession().getAttribute("searchStaffBasicInfo")!=null){
+				workStaffBasicInfo= (WorkStaffBasicInfo) request.getSession().getAttribute("searchStaffBasicInfo");
+				model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+			}
+		}
 		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
 		List<WorkStaffBasicInfo> list = page.getList();
 		model.addAttribute("page", page);

src/main/webapp/static/oss/ossupload.js

@@ -745,7 +745,7 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                         str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                     }
                     str = str +'<a href="javascript:void(0)" onclick="deleteFileFromAliyun1(this,\''+realPath+'/a/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
-                        '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/saveCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+data.createBy+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>'+
+                        '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/saveCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+data.createBy+'\')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>'+
                         '</div>' +
                         '</td>'+
                         '</tr>';

src/main/webapp/webpage/modules/collectAccessory/collectAccessoryCompanyList.jsp

@@ -254,6 +254,7 @@
 					<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/collectAccessory/collectAccessoryList.jsp

@@ -237,6 +237,7 @@
 					<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/collectAccessory/collectAccessoryOfficeList.jsp

@@ -255,6 +255,7 @@
 					<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/feedback/feedbackList.jsp

@@ -377,6 +377,7 @@
 			<form:form id="searchForm" modelAttribute="questionFeedback" action="${ctx}/feedback/questionFeedback/" method="post" class="form-inline">
 			<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 			<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+			<input id="toflag" name="toflag" type="hidden" value="1"/>
 			<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -427,7 +427,7 @@
                                                 </c:otherwise>
                                             </c:choose>
                                             <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
                                             </c:if>
                                         </div>
                                     </td>

src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -480,13 +480,13 @@
                                                 <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                             </c:otherwise>
                                         </c:choose>
-
+                                        <c:if test="${workClientAttachment.collectFlag != 1}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                        </c:if>
                                         <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                             <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         </c:if>
-                                        <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-                                        </c:if>
+
                                     </div>
                                 </td>
                             </tr>

src/main/webapp/webpage/modules/oa/oaNotifyList.jsp

@@ -393,6 +393,7 @@
 			<form:form id="searchForm" modelAttribute="oaNotify" action="${ctx}/oa/oaNotify/${oaNotify.self?'self':''}" method="post" class="form-inline">
 			<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 			<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+			<input id="toflag" name="toflag" type="hidden" value="1"/>
 			<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/oa/oaNotifyListMyself.jsp

@@ -92,6 +92,7 @@
 			<form:form id="searchForm" modelAttribute="oaNotify" action="${ctx}/oa/oaNotify/self" method="post" class="form-inline">
 			<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 			<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+			<input id="toflag" name="toflag" type="hidden" value="1"/>
 			<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/oa/oaNotifyListReadMyself.jsp

@@ -62,6 +62,7 @@
 			<form:form id="searchForm" modelAttribute="oaNotify" action="${ctx}/oa/oaNotify/readSelf" method="post" class="form-inline">
 			<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 			<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+			<input id="toflag" name="toflag" type="hidden" value="1"/>
 			<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -456,13 +456,13 @@
                                                 <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                             </c:otherwise>
                                         </c:choose>
-
+                                        <c:if test="${workClientAttachment.collectFlag != 1 && workClientAttachment.collectFlag!=''}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                        </c:if>
                                         <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                             <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         </c:if>
-                                        <c:if test="${workClientAttachment.collectFlag != 1 && workClientAttachment.collectFlag!=''}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-                                        </c:if>
+
                                     </div>
                                 </td>
                             </tr>

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -361,7 +361,7 @@
                                             </c:otherwise>
                                         </c:choose>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
                                         </c:if>
                                     </div>
                                 </td>

src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp

@@ -245,6 +245,7 @@
 				<form:form id="searchForm" modelAttribute="projectAccessoryRelationInfo" action="${ctx}/projectAccessoryRelation/projectAccessoryRelation/list" method="post" class="form-horizontal layui-form">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<input id="attachmentProjectSortStr" name="attachmentProjectSortStr" type="hidden" value="${attachmentProjectSortStr}"/>
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/projectAccessory/projectEngineering/projectEngineeringList.jsp

@@ -27,6 +27,7 @@
 			<div class="full-width fl">
 				<div class="contentShadow layui-row" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="projectengineeringInfo" action="${ctx}/projectEngineering/projectEngineering" method="post" class="form-inline">
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<div class="commonQuery">
 						<div class="layui-item query athird">
 							<label class="layui-form-label double-line">工程类型名：</label>

src/main/webapp/webpage/modules/projectAccessory/projectTemplate/projectTemplateList.jsp

@@ -27,7 +27,7 @@
 			<div class="full-width fl">
 				<div class="contentShadow layui-row" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="projectTemplateInfo" action="${ctx}/projectTemplate/projectTemplate/" method="post" class="form-inline">
-
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<div class="commonQuery">
 						<div class="layui-item query athird">
 							<label class="layui-form-label double-line">附件结构名：</label>

src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -251,6 +251,9 @@
 									<div class="op-btn-box" >
 										<span>
 										</span>
+										<c:if test="${workClientAttachment.collectFlag != 1}">
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+										</c:if>
 										<c:choose>
 											<c:when test="${workClientAttachment.createBy.id eq fns:getUser().id}">
 												<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?id=${workClientAttachment.id}&type=2&url=${workClientAttachment.url}','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
@@ -261,9 +264,7 @@
 												</shiro:hasPermission>
 											</c:otherwise>
 										</c:choose>
-										<c:if test="${workClientAttachment.collectFlag != 1}">
-											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-										</c:if>
+
 									</div>
 								</td>
 							</tr>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -235,6 +235,7 @@
                 <form:form id="searchForm"  modelAttribute="projectFilingBatch"  action="${ctx}/projectFilingBatch/projectFilingBatchInfo/" method="post" class="form-inline">
                     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
                     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+                    <input id="toflag" name="toflag" type="hidden" value="1"/>
                     <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
                     <div class="commonQuery lw6">
                         <div class="layui-item query athird">

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingForm.jsp

@@ -371,10 +371,11 @@
                                                 <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                             </c:otherwise>
                                         </c:choose>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
                                         </c:if>
+                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+
 
                                     </div>
                                 </td>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -143,6 +143,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/projectPlanConsulting/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostForm.jsp

@@ -372,10 +372,11 @@
                                                 <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                             </c:otherwise>
                                         </c:choose>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
                                         </c:if>
+                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+
                                     </div>
                                 </td>
                             </tr>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -143,6 +143,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/projectPlanCost/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp

@@ -204,6 +204,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/recordChooseCheckAll/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp

@@ -296,6 +296,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/recordChooseCheck/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp

@@ -1486,12 +1486,13 @@
                                                     <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:otherwise>
                                             </c:choose>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                            </c:if>
                                             <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                                 <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
-                                            <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-                                            </c:if>
+
                                         </div>
                                     </td>
                                 </tr>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp

@@ -1490,12 +1490,13 @@
                                                     <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:otherwise>
                                             </c:choose>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                            </c:if>
                                             <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                                 <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
-                                            <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}'" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-                                            </c:if>
+
                                         </div>
                                     </td>
                                 </tr>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -469,6 +469,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectMessage/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -347,6 +347,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -318,6 +318,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectRecords/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsShowFinishList.jsp

@@ -62,6 +62,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectRecords/finishListShow" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsShowList.jsp

@@ -62,6 +62,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectRecords/listShow" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -414,6 +414,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectMessageAll/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -602,7 +602,7 @@
 															</c:otherwise>
 														</c:choose>
 														<c:if test="${fileAttachment.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
 														</c:if>
 													</c:otherwise>
 												</c:choose>
@@ -733,7 +733,7 @@
 															</c:otherwise>
 														</c:choose>
 														<c:if test="${fileGistdata.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
 														</c:if>
 													</c:otherwise>
 												</c:choose>
@@ -866,7 +866,7 @@
 															</c:otherwise>
 														</c:choose>
 														<c:if test="${fileOther.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
 														</c:if>
 													</c:otherwise>
 												</c:choose>
@@ -1169,7 +1169,7 @@
 																	</c:otherwise>
 																</c:choose>
 																<c:if test="${workClientAttachment.collectFlag != 1}">
-																	<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+																	<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
 																</c:if>
 															</div>
 														</td>
@@ -1515,7 +1515,7 @@
 											<div class="op-btn-box" >
 												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												<c:if test="${workClientAttachment.collectFlag != 1}">
-													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
 												</c:if>
 											</div>
 										</td>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -1499,12 +1499,13 @@
                                                     <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:otherwise>
                                             </c:choose>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                            </c:if>
                                             <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                                 <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
-                                            <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-                                            </c:if>
+
                                         </div>
                                     </td>
                                 </tr>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -467,6 +467,7 @@
 				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectMessage/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/serialnum/serialNumTplList.jsp

@@ -72,6 +72,7 @@
 			<form:form id="searchForm" modelAttribute="serialNumTpl" action="${ctx}/serialnum/serialNumTpl/" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/sys/dictList.jsp

@@ -31,6 +31,7 @@
 			<form:form id="searchForm" modelAttribute="dict" action="${ctx}/sys/dict/" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/sys/mainDictList.jsp

@@ -78,6 +78,7 @@
 			<form:form id="searchForm" modelAttribute="mainDict" action="${ctx}/sys/mainDict/" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/sys/officeList.jsp

@@ -112,6 +112,7 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-row" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="office" action="${ctx}/sys/office/" method="post" class="form-inline">
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<div class="commonQuery">
 						<div class="layui-item query athird">
 							<label class="layui-form-label">机构名称：</label>

src/main/webapp/webpage/modules/sys/roleUserList.jsp

@@ -96,6 +96,7 @@
 					<form:hidden path="id"/>
                     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery ">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/sys/sysroleactivityList.jsp

@@ -27,6 +27,7 @@
 			<form:form id="searchForm" modelAttribute="sysRoleActivity" action="${ctx}/sys/sysroleactivity/" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/sys/userList.jsp

@@ -46,6 +46,7 @@
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<input id="company" name="user.company.id" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 					<div class="commonQuery">

src/main/webapp/webpage/modules/workReimbursementType/reimbursementTypeList.jsp

@@ -27,6 +27,7 @@
 			<div class="full-width fl">
 				<div class="contentShadow layui-row" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="workReimbursementTypeInfo" action="${ctx}/reimbursementType/reimbursementType/" method="post" class="form-inline">
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<div class="commonQuery">
 						<div class="layui-item query athird">
 							<label class="layui-form-label double-line">报销内容名：</label>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormDetail.jsp

@@ -284,7 +284,7 @@
                                             </c:otherwise>
                                         </c:choose>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
                                         </c:if>
                                     </td>
                                 </tr>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -140,6 +140,7 @@
 				<form:form id="searchForm" modelAttribute="workClientInfo" action="${ctx}/workclientinfo/workClientInfo/list" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<%--<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->--%>
 					<div class="commonQuery lw7">
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -250,7 +250,7 @@
                                                                 </c:otherwise>
                                                             </c:choose>
                                                             <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
                                                             </c:if>
                                                         </td>
                                                     </tr>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAllList.jsp

@@ -544,6 +544,7 @@
 				<form:form id="searchForm" modelAttribute="workContractInfo" action="${ctx}/workcontractinfo/workContractInfoAll/list" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 				<div class="commonQuery lw7">
 					<div class="layui-item query athird">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -916,12 +916,13 @@
 															<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:otherwise>
 													</c:choose>
+													<c:if test="${workClientAttachment.collectFlag != 1}">
+														<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+													</c:if>
 													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
 														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 													</c:if>
-													<c:if test="${workClientAttachment.collectFlag != 1}">
-														<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-													</c:if>
+
 												</div>
 											</td>
 										</tr>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -858,13 +858,13 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
+											<c:if test="${workClientAttachment.collectFlag != 1}">
+												<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+											</c:if>
 											<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
 												<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 											</c:if>
-											<c:if test="${workClientAttachment.collectFlag != 1}">
-												<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-											</c:if>
+
 										</div>
 									</td>
 								</tr>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -544,6 +544,7 @@
 				<form:form id="searchForm" modelAttribute="workContractInfo" action="${ctx}/workcontractinfo/workContractInfo/list" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 				<div class="commonQuery lw7">
 					<div class="layui-item query athird">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -481,7 +481,7 @@
                                                     </c:otherwise>
                                                 </c:choose>
 												<c:if test="${workClientAttachment.collectFlag != 1}">
-													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
 												</c:if>
 											</div>
 										</td>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -352,7 +352,7 @@
 										</c:otherwise>
 									</c:choose>
 									<c:if test="${workClientAttachment.collectFlag != 1}">
-										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
 									</c:if>
 								</td>
 							</tr>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -406,12 +406,13 @@
 												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
+										<c:if test="${workClientAttachment.collectFlag != 1}">
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+										</c:if>
 										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
 											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 										</c:if>
-										<c:if test="${workClientAttachment.collectFlag != 1}">
-											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-										</c:if>
+
 									</div>
 								</td>
 							</tr>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -371,12 +371,13 @@
 												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
+										<c:if test="${workClientAttachment.collectFlag != 1}">
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+										</c:if>
 										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
 											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 										</c:if>
-										<c:if test="${workClientAttachment.collectFlag != 1}">
-											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-										</c:if>
+
 									</div>
 								</td>
 							</tr>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -406,6 +406,7 @@
 				<form:form id="searchForm" modelAttribute="workInvoice" action="${ctx}/workinvoiceAll/workInvoiceAll/" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<%--<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->--%>
 
 					<div class="commonQuery lw9">

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -460,9 +460,10 @@
 		</div>--%>
 		<div class="full-width fl">
 			<div class=" layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="workInvoice" action="${ctx}/workinvoice/workInvoice/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="workInvoiceShow" action="${ctx}/workinvoice/workInvoice/" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<%--<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->--%>
 
 					<div class="commonQuery lw9">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyBacklogListByMine.jsp

@@ -385,6 +385,7 @@
 			<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/backlogListByMine" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -522,6 +522,7 @@
 			<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/list" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadBacklogList.jsp

@@ -385,6 +385,7 @@
 			<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/backlogListReadShow" method="post" class="form-inline">
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<input id="toflag" name="toflag" type="hidden" value="1"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 				<div class="commonQuery">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadShowList.jsp

@@ -140,6 +140,7 @@
 				<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/listReadShow" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 					<div class="commonQuery">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyShowList.jsp

@@ -140,6 +140,7 @@
 				<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/listShow" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 					<div class="commonQuery">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

@@ -35,6 +35,7 @@
                     <%--以下三行照抄--%>
                     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
                     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+                    <input id="toflag" name="toflag" type="hidden" value="1"/>
                     <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
                     <div class="commonQuery">
                         <div class="layui-item query athird">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp

@@ -466,7 +466,7 @@
 											</c:otherwise>
 										</c:choose>
 										<c:if test="${workClientAttachment.collectFlag != 1}">
-											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
 										</c:if>
 									</div>
 								</td>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementCWAudit.jsp

@@ -785,7 +785,7 @@
                                         </c:otherwise>
                                     </c:choose>
                                     <c:if test="${workClientAttachment.collectFlag != 1}">
-                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
                                     </c:if>
                                     <%--<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                         <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -1063,13 +1063,13 @@
                                             <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                         </c:otherwise>
                                     </c:choose>
-
+                                    <c:if test="${workClientAttachment.collectFlag != 1}">
+                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"   style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                    </c:if>
                                     <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                         <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                     </c:if>
-                                    <c:if test="${workClientAttachment.collectFlag != 1}">
-                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-                                    </c:if>
+
                                 </div>
                             </td>
                         </tr>