1.角色菜单树新增角色时增加数据范围

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