Skip to content

H
hg-smart
Commit 6b0b03c0 by 宋祥
Options

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

 Conflicts:
	pom.xml
parents dba3e65a 5b2b2ac9
Showing with 35 additions and 18 deletions
src/main/java/com/baosight/xservices/xs/sql/XS07.xml
...@@ -93,7 +93,8 @@ ...@@ -93,7 +93,8 @@
t1.rec_revisor as "recRevisor", t1.rec_revisor as "recRevisor",
t1.rec_revise_time as "recReviseTime", t1.rec_revise_time as "recReviseTime",
t1.archive_flag as "archiveFlag", t1.archive_flag as "archiveFlag",
t1.sort_index as "sortIndex" t1.sort_index as "sortIndex",
t7.type as "resourceType"
FROM ${platSchema}.XS_AUTHORIZATION t1 FROM ${platSchema}.XS_AUTHORIZATION t1
LEFT JOIN ${platSchema}.XS_USER_GROUP t2 ON t1.subject_id=t2.ID 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 LEFT JOIN ${platSchema}.XS_USER t3 ON t1.subject_id = t3.USER_ID
......
src/main/webapp/XS/XS3201.jsp
...@@ -176,25 +176,41 @@ ...@@ -176,25 +176,41 @@
<EF:EFInput type="hidden" cname="授权客体类型" ename="objectType" row="0" <EF:EFInput type="hidden" cname="授权客体类型" ename="objectType" row="0"
blockId="inqu_status" blockId="inqu_status"
name="inqu_status-0-objectType" value=""/> name="inqu_status-0-objectType" value=""/>
<EF:EFInput cname="授权中文名" ename="objectName" row="0" blockId="inqu_status"/> <EF:EFInput cname="授权中文名" ename="objectName" row="0" blockId="inqu_status"
<EF:EFInput cname="授权英文名" ename="objectEname" 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> </div>
</EF:EFRegion> </EF:EFRegion>
<EF:EFGrid blockId="result3" autoDraw="no" autoBind="false" <EF:EFRegion id="result3" title="结果集">
queryMethod="queryResourceAndGroupByUserGroup" <EF:EFGrid blockId="result3" autoDraw="no" autoBind="false"
deleteMethod="deleteResourceAndGroupByUserGroup" queryMethod="queryResourceAndGroupByUserGroup"
updateMethod="updateResourceAndGroupByUserGroup"> deleteMethod="deleteResourceAndGroupByUserGroup"
<EF:EFColumn ename="subjectId" cname="授权主体id" readonly="true" primaryKey="true" updateMethod="updateResourceAndGroupByUserGroup">
hidden="true"/> <EF:EFColumn ename="subjectId" cname="授权主体id" readonly="true" primaryKey="true"
<EF:EFColumn ename="objectId" cname="授权客体id" readonly="true" hidden="true"/> hidden="true"/>
<EF:EFColumn ename="objectType" cname="授权客体类型" readonly="true" hidden="true"/> <EF:EFColumn ename="objectId" cname="授权客体id" readonly="true" hidden="true"/>
<EF:EFColumn ename="objectName" cname="授权中文名" readonly="true"/> <EF:EFColumn ename="objectType" cname="授权客体类型" readonly="true" hidden="true"/>
<EF:EFColumn ename="objectEname" cname="授权英文名" readonly="true"/> <EF:EFColumn ename="objectEname" cname="授权英文名" enable="false"/>
<EF:EFComboColumn cname="操作类型" ename="operationType" sourceName="operationTypeList" <EF:EFColumn ename="objectName" cname="授权中文名" enable="false"/>
textField="desc" readonly="false" <EF:EFComboColumn ename="resourceType" cname="资源类型" enable="false" width="80"
valueField="name" style="text-align:center;" copy="true"> align="center">
</EF:EFComboColumn> <EF:EFOption label="" value=""/>
</EF:EFGrid> <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> </div>
<%--<div id="resourceGroup" title="已授权资源组" value="RESOURCE_GROUP"> <%--<div id="resourceGroup" title="已授权资源组" value="RESOURCE_GROUP">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment