mantis:0000009

This commit is contained in:
chenjinsong
2018-03-22 17:26:10 +08:00
parent b0bd2d4593
commit bf300386d2
2 changed files with 9 additions and 3 deletions

View File

@@ -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<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(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<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(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<SystemServiceInfo> list = systemServiceService.findList(ssi);
if (!Collections3.isEmpty(list)) {
Collections.sort(list, new Comparator<SystemServiceInfo>() {

View File

@@ -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
<if test="serviceName != null and serviceName != ''">
and ssi.service_name like CONCAT('%', #{serviceName}, '%')
</if>
@@ -51,7 +51,10 @@
and ssi.service_type=#{serviceType}
</if>
<if test="serviceIdPre != null">
and service_id like concat(#{serviceIdPre}, '%')
and ssi.service_id like concat(#{serviceIdPre}, '%')
</if>
<if test="isValid != null">
and ssi.is_valid=#{isValid}
</if>
order by ssi.service_id asc
</select>
@@ -100,7 +103,7 @@
from
system_service_info
where
service_id=#{serviceId} and is_valid=1
service_id=#{serviceId}
</select>
<insert id="insert">