Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
zhangshilin
2018-03-28 13:06:09 +08:00
12 changed files with 224 additions and 119 deletions

View File

@@ -78,10 +78,10 @@ public class DnsIpCfgController extends BaseController {
@RequestMapping("delete")
public String delete(Model model, HttpServletRequest request,
HttpServletResponse response, DnsIpCfg dnsIpCfg) {
String cfgIds = dnsIpCfg.getCfgIds();
if (!StringUtils.isEmpty(cfgIds)) {
String fakeIds = dnsIpCfg.getFakeIds();
if (!StringUtils.isEmpty(fakeIds)) {
try {
dnsIpCfgService.delete(cfgIds);
dnsIpCfgService.delete(fakeIds);
addMessage(model, "delete_success");
} catch (Exception e) {
logger.error("删除失败", e);