gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改专项任务和来函权限按钮展示以及列表展示权限用户下的数据

Browse Source 
修改特定服务bug
This commit is contained in:
duandongmei
2018-07-16 14:21:21 +08:00
parent 60b3a1ae34
commit 1ebb1437ff
16 changed files with 146 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/basics/TaskInfoController.java
View File

@@ -31,7 +31,7 @@ public class TaskInfoController extends BaseController{
*/
@RequestMapping(value = {"list",""})
public String list(TaskInfo taskInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
Page<TaskInfo> page = taskInfoService.findTaskInfo(new Page<TaskInfo>(request, response), taskInfo);
Page<TaskInfo> page = taskInfoService.findTaskInfo(new Page<TaskInfo>(request, response,"r"), taskInfo);
model.addAttribute("page", page);
return "/basics/taskInfoList";
}
@@ -76,7 +76,7 @@ public class TaskInfoController extends BaseController{
} catch (Exception e) {
logger.error(e.getMessage());
e.printStackTrace();
addMessage(model, "save_failed");
addMessage(redirectAttributes, "save_failed");
}
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}

2
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -32,7 +32,7 @@ public class RequestInfoController extends BaseController{
*/
@RequestMapping(value = {"list",""})
public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response), requestInfo);
Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response,"r"), requestInfo);
model.addAttribute("page", page);
return "/cfg/requestList";
}

6
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -53,9 +53,9 @@ public class SpecificServiceCfgController extends BaseController {
Model model) {
String searchType = null;
String searchContent = null;
if(specificServiceCfg.getSpecServiceId()!=null){
searchType = "specServiceId";
searchContent = specificServiceCfg.getSpecServiceId().toString();
if(specificServiceCfg.getSpecServiceCode()!=null){
searchType = "specServiceCode";
searchContent = specificServiceCfg.getSpecServiceCode().toString();
}
if(!StringUtils.isBlank(specificServiceCfg.getSpecServiceName())){
searchType = "specServiceName";