diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java index 22c785dde..de448b540 100644 --- a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java +++ b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java @@ -41,6 +41,7 @@ public class SystemServiceController extends BaseController { @RequiresPermissions("system:service:view") @RequestMapping(value = "list") public String list(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { + systemServiceInfo.setIsValid(1); Page page = systemServiceService.findPage(new Page(request, response, 30), systemServiceInfo); model.addAttribute("page", page); return "/systemService/list"; @@ -118,6 +119,7 @@ public class SystemServiceController extends BaseController { public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { systemServiceService.deleteService(systemServiceInfo); try { + systemServiceInfo.setIsValid(1); Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); model.addAttribute("page", page); addMessage(model, "删除成功"); @@ -153,6 +155,7 @@ public class SystemServiceController extends BaseController { if (serviceIdPre != null) { SystemServiceInfo ssi = new SystemServiceInfo(); ssi.setServiceIdPre(serviceIdPre); + ssi.setIsValid(null); List list = systemServiceService.findList(ssi); if (!Collections3.isEmpty(list)) { Collections.sort(list, new Comparator() { diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml index 6f8d640a1..c9dfe4b18 100644 --- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml +++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml @@ -37,7 +37,7 @@ from system_service_info ssi left join sys_user suc on suc.id=ssi.creator_id left join sys_user sue on sue.id=ssi.editor_id - where ssi.is_valid=1 + where 1=1 and ssi.service_name like CONCAT('%', #{serviceName}, '%') @@ -51,7 +51,10 @@ and ssi.service_type=#{serviceType} - and service_id like concat(#{serviceIdPre}, '%') + and ssi.service_id like concat(#{serviceIdPre}, '%') + + + and ssi.is_valid=#{isValid} order by ssi.service_id asc @@ -100,7 +103,7 @@ from system_service_info where - service_id=#{serviceId} and is_valid=1 + service_id=#{serviceId}