From ba536b63d39553c25604e4c319542182cd3e3f29 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 14 Jun 2018 16:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95deleteByCompileIds=EF=BC=8C=E4=BC=A0=E5=85=A5=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BC=A0=E5=85=A5=E7=9A=84compileIds=E4=B8=B2?=
 =?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?IP=E6=97=B6=E8=B0=83=E7=94=A8=E6=AD=A4=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/dao/configuration/IpCfgDao.java  |  1 +
 .../java/com/nis/web/dao/configuration/IpCfgDao.xml   |  3 +++
 .../nis/web/service/configuration/IpCfgService.java   | 11 +----------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
index ab7e83b4d..f5d2a9b25 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
@@ -29,4 +29,5 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
 	public int getIsAudit(@Param("tableName")String tableName,@Param("cfgId")Long id);
 	public int getIsAudit(BaseIpCfg entity);
 	public int deleteByCompileId(BaseIpCfg entity);
+	public int deleteByCompileIds(@Param("user")long user,@Param("tableName")String tableName,@Param("compileIds")String compileIds);
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 0a3f805f9..a9a7ee632 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -543,4 +543,7 @@
   <update id="deleteByCompileId" parameterType="com.nis.domain.configuration.BaseIpCfg" >
     update ${tableName} set is_valid = -1, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where compile_id = #{compileId,jdbcType=INTEGER}
   </update>
+  <update id="deleteByCompileIds" parameterType="com.nis.domain.configuration.BaseIpCfg" >
+    update ${tableName} set is_valid = -1, editor_id = #{user,jdbcType=INTEGER} , edit_time = NOW() where compile_id in (${compileIds})
+  </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 30b51cbce..2ca15f57c 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -334,17 +334,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		if(StringUtils.isNotBlank(compileIds)){
 			for(String compileId:compileIds.split(",")){//强转数字，防止注入
 				Integer.parseInt(compileId);
-//				AreaIpCfg area=new AreaIpCfg();
-//				area.setCompileId(Integer.parseInt(compileId));
-//				area.setFunctionId(functionId);
-//				area.setIsValid(Constants.VALID_DEL);
-//				areaIpCfgDao.updateValid(area);
 			}
-			BaseIpCfg area=new BaseIpCfg();
-			area.setTableName(AreaIpCfg.getTablename());
-			area.setCompileId(Integer.parseInt(compileIds));
-			area.setIsValid(Constants.VALID_DEL);
-			ipCfgDao.deleteByCompileId(area);
+			ipCfgDao.deleteByCompileIds(new BaseIpCfg().getCurrentUser().getId(),AreaIpCfg.getTablename(),compileIds);
 		}
 		List<BaseIpCfg> ipCfgs=new ArrayList<BaseIpCfg>();
 		Date date =new Date();