1.fixBug：角色无法删除的问题；文档库显示下载记录和预览记录

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD003.xml

@@ -99,7 +99,7 @@
 
     <select id="count" resultClass="int">
         SELECT COUNT(*)
-        FROM ${hggpSchema}.HGWD001 A
+        FROM ${hggpSchema}.HGWD003 A
         INNER JOIN ${platSchema}.XS_USER B ON A.USER_ID = B.LOGIN_NAME
         LEFT JOIN ${platSchema}.TXSOG02 C ON B.USER_ID = C.USER_ID
         LEFT JOIN ${platSchema}.TXSOG01 D ON C.ORG_ID = D.ORG_ID

src/main/java/com/baosight/xservices/xs/service/ServiceXSUserManage.java

@@ -840,12 +840,12 @@ public class ServiceXSUserManage extends ServiceEPBase {
 								throw new PlatException("[" + groupEname + "]用户组存在授权关系，不能删除!");
 							}
 							
-							map.put("authGroupId", groupId);
-							List groupDataAuth = this.dao.query("XS10.query", map);
-							eiInfo.set(EiConstant.serviceId, "S_XS_31");
-							if (null != groupDataAuth && groupDataAuth.size() > 0) {
-								throw new PlatException("[" + groupEname + "]用户组存在数据集授权关系，不能删除!");
-							}
+//							map.put("authGroupId", groupId);
+//							List groupDataAuth = this.dao.query("XS10.query", map);
+//							eiInfo.set(EiConstant.serviceId, "S_XS_31");
+//							if (null != groupDataAuth && groupDataAuth.size() > 0) {
+//								throw new PlatException("[" + groupEname + "]用户组存在数据集授权关系，不能删除!");
+//							}
 						}
 						
 						inInfoRowMap.put("groupId", groupId);

src/main/webapp/HG/WD/HGWD001.js

@@ -491,7 +491,11 @@ $(function () {
 				        + '\')" target="_blank">变更</a>';
 			        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
 				        + 'onclick="changeFileRecords(\'' + model.id + '\',\'' + model.docId
-				        + '\',\'' + model.docName + '\')" target="_blank">变更记录</a>';
+				        + '\',\'' + model.docName + '\')" target="_blank">变更记录</a><br/>';
+			        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+				        + 'onclick="showQueryRecord(\'' + model.docId + '\')" >预览记录</a>';
+			        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+				        + 'onclick="showDownloadRecord(\'' + model.docId + '\')" >下载记录</a>';
 			        return template;
 		        }
 	        }, {
@@ -1128,3 +1132,34 @@ let treeSelectClick = function (nodeData) {
 	// 刷新列表
 	query();
 }
+
+
+/**
+ * 显示查询记录
+ *
+ * @param docId
+ */
+let showQueryRecord = function (docId) {
+	let fileId = IPLATUI.EFTree.categoryTree.selectTreeNode.fileId;
+	JSColorbox.open({
+		href: "HGWD001B?inqu_status-0-fileId=" + fileId + "&inqu_status-0-docId=" + docId,
+		title: "<div style='text-align: center;'>预览记录</div>",
+		width: "80%",
+		height: "80%",
+	});
+}
+
+/**
+ * 显示下载记录
+ *
+ * @param docId
+ */
+let showDownloadRecord = function (docId) {
+	let fileId = IPLATUI.EFTree.categoryTree.selectTreeNode.fileId;
+	JSColorbox.open({
+		href: "HGWD001C?inqu_status-0-fileId=" + fileId + "&inqu_status-0-docId=" + docId,
+		title: "<div style='text-align: center;'>下载记录</div>",
+		width: "80%",
+		height: "80%",
+	});
+}
\ No newline at end of file

src/main/webapp/HG/WD/HGWD001.jsp

@@ -81,7 +81,7 @@
 				           sort="single" serviceName="HGWD099" queryMethod="query" deleteMethod="delete">
 					<EF:EFColumn ename="id" cname="ID" hidden="true"/>
 					<EF:EFColumn ename="docId" cname="文件ID" enable="false" width="180" hidden="true"/>
-					<EF:EFColumn ename="operator" cname="操作" enable="false" width="140" align="center" sort="false"/>
+					<EF:EFColumn ename="operator" cname="操作" enable="false" width="150" align="center" sort="false"/>
 					<EF:EFColumn ename="docName" cname="附件名称" enable="false" width="200"/>
 					<EF:EFColumn ename="docType" cname="附件类型" enable="false" width="110" align="center"/>
 					<EF:EFColumn ename="docVersion" cname="版本号" enable="false" width="90" align="center" sort="true"/>

src/main/webapp/HG/WD/HGWD002.js

@@ -156,10 +156,6 @@ $(function () {
 				template: function (model) {
 					let param = "'" + model.docId + "', '" + model.docType + "', '" + model.docName + "'";
 					let template = '';
-					// template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-					// 	+ 'onclick="showQueryRecord(' + param + ')" >预览记录</a>';
-					// template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-					// 	+ 'onclick="showDownloadRecord(' + param + ')" >下载记录</a>';
 					template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
 						+ 'onclick="showPreview(' + param + ')" >预览</a>';
 					return template;