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

pom.xml

@@ -15,7 +15,7 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>hggp</name>
+    <name>hggp_dev</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -249,6 +249,26 @@ public class ServiceXS40 extends ServiceEPBase {
 		return outInfo;
 	}
 	
+	public EiInfo updateForMemberGroups(EiInfo inInfo) {
+		EiInfo eiInfo = new EiInfo();
+		EiBlock r1Block = inInfo.getBlock("result1");
+		EiBlock eiBlock = new EiBlock(EiConstant.resultBlock);
+		eiBlock.setRows(r1Block.getRows());
+		for (int i = 0; i < eiBlock.getRowCount(); ++i) {
+			Map<String, Object> inInfoRowMap = eiBlock.getRow(i);
+			AssertUtils.isEmpty(MapUtils.getString(inInfoRowMap, "groupEname"), "角色英文名不能为空");
+			inInfoRowMap.put("recRevisor", UserSession.getUser().getUsername());
+			inInfoRowMap.put("recReviseTime", DateUtils.curDateTimeStr14());
+		}
+		
+		eiInfo.addBlock(eiBlock);
+		eiInfo.set(EiConstant.serviceId, "S_XS_20");
+		EiInfo outInfo = XServiceManager.call(eiInfo);
+		r1Block.setRows(outInfo.getBlock(EiConstant.resultBlock).getRows());
+		outInfo.addBlock(r1Block);
+		return outInfo;
+	}
+	
 	public EiInfo deleteGroupFromTree(EiInfo inInfo) {
 		String groupId = (String)inInfo.get("groupId");
 		String parentId = (String)inInfo.get("parentId");

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

@@ -316,7 +316,8 @@
         group_ename as "groupEname",
         group_cname as "groupCname",
         manage_group_ename as "manageGroupEname",
-        group_type as "groupType"
+        group_type as "groupType",
+        data_auth_type as "dataAuthType"
         FROM ${platSchema}.XS_USER_GROUP where 1=1 and group_ename != 'ADMIN' and group_ename != 'root'
         and group_ename != 'managerRoot'
         <isNotEmpty prepend=" AND " property="insertParentId">

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/XS3002.jsp

@@ -24,7 +24,7 @@
 	                                 data-errorprompt="对不起,用户组英文名只能是32位英文字母或数字字符或下划线或@符"/>
 	                    <EF:EFColumn ename="groupCname" cname="角色中文名" required="true" style="text-align:left;"/>
 	                    <EF:EFComboColumn ename="dataAuthType" cname="查看数据范围" width="110" align="center"
-	                                      required="true">
+	                                      defaultValue="1" required="true">
 		                    <EF:EFCodeOption codeName="hggp.role.dataAuthType"/>
 	                    </EF:EFComboColumn>
 	                    <EF:EFComboColumn ename="depCode" cname="所属部门编码" width="150" align="center"

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">

src/main/webapp/XS/XS40.jsp

@@ -148,15 +148,16 @@
                 <EF:EFColumn ename="groupId" locked="true" cname="角色ID" hidden="true" primaryKey="true"/>
                 <EF:EFColumn ename="groupEname" cname="角色英文名" readonly="true"/>
                 <EF:EFColumn ename="groupCname" cname="角色中文名" readonly="true"/>
-
-
+	            <EF:EFComboColumn ename="dataAuthType" cname="查看数据范围" width="110" align="center"
+	                              defaultValue="4" required="true" readonly="true">
+		            <EF:EFCodeOption codeName="hggp.role.dataAuthType"/>
+	            </EF:EFComboColumn>
                 <EF:EFColumn ename="manageGroupEname" cname="管辖组英文名" style="text-align:left;" hidden="true"/>
                 <EF:EFColumn ename="manageGroupCname" cname="管辖组中文名" style="text-align:left;" readonly="true"
                              hidden="true"/>
                 <EF:EFComboColumn ename="groupType" cname="群组类型" valueField="valueField" textField="textField"
                                   defaultValue="NORMAL" columnTemplate="#=textField#" align="center"
-                                  required="true"
-                                  hidden="true">
+                                  required="true" hidden="true">
                     <EF:EFCodeOption codeName="iplat.xs.userGroup"/>
                 </EF:EFComboColumn>
                 <EF:EFColumn ename="sortIndex" cname="排序" style="text-align:right;" hidden="true"/>