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

src/main/java/com/baosight/xservices/xs/tools/XsTools.java

@@ -51,7 +51,7 @@ public class XsTools {
 			AssertUtils.isEmpty(subjectId, "subjectId不能为空");
 			Map queryMap = new HashMap();
 			queryMap.put("subjectId", subjectId);
-			return DaoBase.getInstance().query("XS07.get", queryMap);
+			return DaoBase.getInstance().queryAll("XS07.get", queryMap);
 		}
 		
 		/**
@@ -62,7 +62,7 @@ public class XsTools {
 			AssertUtils.isEmpty(subjectIds, "subjectId不能为空");
 			Map queryMap = new HashMap();
 			queryMap.put("subjectIds", subjectIds);
-			return DaoBase.getInstance().query("XS07.get", queryMap);
+			return DaoBase.getInstance().queryAll("XS07.get", queryMap);
 		}
 		
 		/**

src/main/webapp/HG/CG/HGCG003A.jsp

@@ -77,7 +77,8 @@
 				<EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="purUserName" cname="采购员" enable="false" width="100" align="center"/>
-			<EF:EFComboColumn ename="calculationMethod" cname="计算方式" width="100" align="center" required="true">
+			<EF:EFComboColumn ename="calculationMethod" cname="计算方式" width="100" align="center" required="true"
+			                  copy="true">
 				<EF:EFCodeOption codeName="hggp.cg.calculationMethod"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" enable="false"/>

src/main/webapp/XS/XS3201.js

@@ -421,7 +421,7 @@ const copyAuth = function () {
 		href: "XS3201B",
 		title: "<div style='text-align: center;'>正在复制:【" + groupCname + "】的菜单权限...</div>",
 		width: "70%",
-		height: "80%",
+		height: "90%",
 		params: params,
 		callbackName: copyAuthCallback
 	});