Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev

 Conflicts:
	pom.xml

src/main/java/com/baosight/xservices/xs/sql/XS07.xml

@@ -93,7 +93,8 @@
         t1.rec_revisor as "recRevisor",
         t1.rec_revise_time as "recReviseTime",
         t1.archive_flag as "archiveFlag",
-        t1.sort_index as "sortIndex"
+        t1.sort_index as "sortIndex",
+        t7.type as "resourceType"
         FROM ${platSchema}.XS_AUTHORIZATION t1
         LEFT JOIN ${platSchema}.XS_USER_GROUP t2 ON t1.subject_id=t2.ID
         LEFT JOIN ${platSchema}.XS_USER t3 ON t1.subject_id = t3.USER_ID

src/main/webapp/XS/XS3201.jsp

@@ -176,10 +176,19 @@
 			                        <EF:EFInput type="hidden" cname="授权客体类型" ename="objectType" row="0"
 			                                    blockId="inqu_status"
 			                                    name="inqu_status-0-objectType" value=""/>
-			                        <EF:EFInput cname="授权中文名" ename="objectName" row="0" blockId="inqu_status"/>
-			                        <EF:EFInput cname="授权英文名" ename="objectEname" row="0" blockId="inqu_status"/>
+			                        <EF:EFInput cname="授权中文名" ename="objectName" row="0" blockId="inqu_status"
+			                                    colWidth="4"/>
+			                        <EF:EFInput cname="授权英文名" ename="objectEname" row="0" blockId="inqu_status"
+			                                    colWidth="4"/>
+			                        <EF:EFSelect cname="资源类型" ename="resourceType" row="0" blockId="inqu_status"
+			                                     colWidth="4">
+				                        <EF:EFOption label="全部" value=""/>
+				                        <EF:EFOption label="页面" value="PAGE"/>
+				                        <EF:EFOption label="按钮" value="BUTTON"/>
+			                        </EF:EFSelect>
 		                        </div>
 	                        </EF:EFRegion>
+	                        <EF:EFRegion id="result3" title="结果集">
 		                        <EF:EFGrid blockId="result3" autoDraw="no" autoBind="false"
 		                                   queryMethod="queryResourceAndGroupByUserGroup"
 		                                   deleteMethod="deleteResourceAndGroupByUserGroup"
@@ -188,13 +197,20 @@
 			                                     hidden="true"/>
 			                        <EF:EFColumn ename="objectId" cname="授权客体id" readonly="true" hidden="true"/>
 			                        <EF:EFColumn ename="objectType" cname="授权客体类型" readonly="true" hidden="true"/>
-		                        <EF:EFColumn ename="objectName" cname="授权中文名" readonly="true"/>
-		                        <EF:EFColumn ename="objectEname" cname="授权英文名" readonly="true"/>
+			                        <EF:EFColumn ename="objectEname" cname="授权英文名" enable="false"/>
+			                        <EF:EFColumn ename="objectName" cname="授权中文名" enable="false"/>
+			                        <EF:EFComboColumn ename="resourceType" cname="资源类型" enable="false" width="80"
+			                                          align="center">
+				                        <EF:EFOption label="" value=""/>
+				                        <EF:EFOption label="页面" value="PAGE"/>
+				                        <EF:EFOption label="按钮" value="BUTTON"/>
+			                        </EF:EFComboColumn>
 			                        <EF:EFComboColumn cname="操作类型" ename="operationType" sourceName="operationTypeList"
 			                                          textField="desc" readonly="false"
 			                                          valueField="name" style="text-align:center;" copy="true">
 			                        </EF:EFComboColumn>
 		                        </EF:EFGrid>
+	                        </EF:EFRegion>
                         </div>
                     </div>
                     <%--<div id="resourceGroup" title="已授权资源组" value="RESOURCE_GROUP">