From 8ec046875a8e3cbde90cddf7fa97cd88ef06fa57 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Wed, 14 Nov 2018 09:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=A0=E9=99=A4=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skyeye/smprogram/dao/RmPropertyDao.java   |  2 ++
 .../service/impl/RmPropertyServiceImpl.java   | 24 ++++++++++++++++---
 .../resources/dbmapper/RmPropertyMapper.xml   |  9 +++++++
 .../webapp/js/rmproperty/rmpropertylist.js    |  1 +
 .../webapp/tpl/rmproperty/rmpropertylist.html |  2 +-
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/skyeye-dao/src/main/java/com/skyeye/smprogram/dao/RmPropertyDao.java b/skyeye-dao/src/main/java/com/skyeye/smprogram/dao/RmPropertyDao.java
index d5df38aab..c01277ca0 100644
--- a/skyeye-dao/src/main/java/com/skyeye/smprogram/dao/RmPropertyDao.java
+++ b/skyeye-dao/src/main/java/com/skyeye/smprogram/dao/RmPropertyDao.java
@@ -24,4 +24,6 @@ public interface RmPropertyDao {
 
 	public Map<String, Object> queryRmPropertyValueNumById(Map<String, Object> map) throws Exception;
 
+	public Map<String, Object> queryUseRmPropertyNumById(Map<String, Object> map) throws Exception;
+
 }
diff --git a/skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/RmPropertyServiceImpl.java b/skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/RmPropertyServiceImpl.java
index 907fdca8d..50878a99c 100644
--- a/skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/RmPropertyServiceImpl.java
+++ b/skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/RmPropertyServiceImpl.java
@@ -79,10 +79,28 @@ public class RmPropertyServiceImpl implements RmPropertyService{
 		Map<String, Object> map = inputObject.getParams();
 		Map<String, Object> bean = rmPropertyDao.queryRmPropertyValueNumById(map);
 		if(bean == null){
-			rmPropertyDao.deleteRmPropertyMationById(map);
-		}else{
-			if(Integer.parseInt(bean.get("propertyValueNum").toString()) == 0){//该样式属性下有值
+			Map<String, Object> useThisBean = rmPropertyDao.queryUseRmPropertyNumById(map);
+			if(useThisBean == null){
 				rmPropertyDao.deleteRmPropertyMationById(map);
+			}else{
+				if(Integer.parseInt(useThisBean.get("usePropertyNum").toString()) == 0){//该样式属性没有被使用
+					rmPropertyDao.deleteRmPropertyMationById(map);
+				}else{
+					outputObject.setreturnMessage("该样式属性正在使用中，无法删除。");
+				}
+			}
+		}else{
+			if(Integer.parseInt(bean.get("propertyValueNum").toString()) == 0){//该样式属性下没有值
+				Map<String, Object> useThisBean = rmPropertyDao.queryUseRmPropertyNumById(map);
+				if(useThisBean == null){
+					rmPropertyDao.deleteRmPropertyMationById(map);
+				}else{
+					if(Integer.parseInt(useThisBean.get("usePropertyNum").toString()) == 0){//该样式属性没有被使用
+						rmPropertyDao.deleteRmPropertyMationById(map);
+					}else{
+						outputObject.setreturnMessage("该样式属性正在使用中，无法删除。");
+					}
+				}
 			}else{
 				outputObject.setreturnMessage("该样式属性下存在值，无法删除。");
 			}
diff --git a/skyeye-web/src/main/resources/dbmapper/RmPropertyMapper.xml b/skyeye-web/src/main/resources/dbmapper/RmPropertyMapper.xml
index 37a0c7447..5e1c8d5c6 100644
--- a/skyeye-web/src/main/resources/dbmapper/RmPropertyMapper.xml
+++ b/skyeye-web/src/main/resources/dbmapper/RmPropertyMapper.xml
@@ -14,6 +14,7 @@
 			a.js_rely_on jsRelyOn,
 			a.property_unit propertyUnit,
 			(SELECT COUNT(*) FROM rm_property_value c WHERE c.property_id = a.id) propertyValueNum,
+			(SELECT COUNT(*) FROM rm_group_member_property d WHERE d.property_id = a.id) useNum,
 			CONVERT(a.create_time, char) createTime
 		FROM
 			rm_property a
@@ -57,6 +58,14 @@
 		WHERE a.property_id = #{id}
 	</select>
 	
+	<select id="queryUseRmPropertyNumById" parameterType="java.util.Map" resultType="java.util.Map">
+		SELECT 
+			COUNT(*) usePropertyNum
+		FROM 
+			rm_group_member_property a 
+		WHERE a.property_id = #{id}
+	</select>
+	
 	<delete id="deleteRmPropertyMationById" parameterType="java.util.Map">
 		DELETE
 		FROM
diff --git a/skyeye-web/src/main/webapp/js/rmproperty/rmpropertylist.js b/skyeye-web/src/main/webapp/js/rmproperty/rmpropertylist.js
index 24e9d0942..c00685e7c 100644
--- a/skyeye-web/src/main/webapp/js/rmproperty/rmpropertylist.js
+++ b/skyeye-web/src/main/webapp/js/rmproperty/rmpropertylist.js
@@ -31,6 +31,7 @@ layui.config({
 	        { field: 'propertyOut', title: '外部属性', width: 150 },
 	        { field: 'contentName', title: '展现形式', width: 180 },
 	        { field: 'propertyValueNum', title: '属性值数量', width: 150 },
+	        { field: 'useNum', title: '使用数量', width: 150 },
 	        { field: 'id', title: 'HTML内容', width: 180, templet: function(d){
 	        	if(!isNull(d.htmlContent)){
 	        		return '<i class="fa fa-fw fa-html5 cursor" lay-event="htmlContent"></i>';
diff --git a/skyeye-web/src/main/webapp/tpl/rmproperty/rmpropertylist.html b/skyeye-web/src/main/webapp/tpl/rmproperty/rmpropertylist.html
index c894f3799..5628db61e 100644
--- a/skyeye-web/src/main/webapp/tpl/rmproperty/rmpropertylist.html
+++ b/skyeye-web/src/main/webapp/tpl/rmproperty/rmpropertylist.html
@@ -52,7 +52,7 @@
         <table id="messageTable" lay-filter="messageTable"></table>
         <script type="text/html" id="tableBar">
             <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
-			{{# if(d.propertyValueNum == 0){ }}
+			{{# if(d.propertyValueNum == 0 && d.useNum == 0){ }}
           		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 			{{# } }}
         </script>
-- 
GitLab