1.前端页面增加辅机页面号输入框

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ015A.xml

@@ -90,7 +90,7 @@
             DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
         </isNotEmpty>
     </sql>
-    
+
     <sql id="condition">
         <include refid="authCondition"/>
         <isNotEmpty prepend=" AND " property="id">
@@ -133,7 +133,7 @@
             A.DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
         </isNotEmpty>
     </sql>
-    
+
 	<sql id="condition1">
         <include refid="authCondition1"/>
 		<isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002A.java

@@ -53,9 +53,8 @@ public class ServiceHPSC002A extends ServiceEPBase {
 			if (CollectionUtils.isNotEmpty(dbSc002s) || CollectionUtils.isNotEmpty(HPSC006)) {
 				inInfo.set("inqu_status-0-bizType", queryMap.get("bizType"));
 				inInfo.set("inqu_status-0-matId", queryMap.get("id"));
-
-				inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC002A().eiMetadata);
 			}
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC002A().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002B.xml

@@ -38,7 +38,7 @@
             A.DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
         </isNotEmpty>
     </sql>
-    
+
 	<sql id="condition">
         <include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005A.xml

@@ -34,7 +34,7 @@
             DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
         </isNotEmpty>
     </sql>
-    
+
 	<sql id="condition">
         <include refid="authCondition"/>
         <isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005B.xml

@@ -49,7 +49,7 @@
             A.DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
         </isNotEmpty>
     </sql>
-    
+
     <sql id="condition">
         <include refid="authCondition"/>
         <isNotEmpty prepend=" AND " property="companyCode">

src/main/java/com/baosight/hpjx/hp/zl/sql/HPZL001.xml

@@ -45,7 +45,7 @@
             DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
         </isNotEmpty>
     </sql>
-    
+
     <sql id="condition">
         AND DELETE_FLAG = 0
         <include refid="authCondition"/>

src/main/java/com/baosight/iplat4j/core/data/ibatis/dao/SqlMapDaoLogProxy.java

@@ -201,7 +201,7 @@ public class SqlMapDaoLogProxy extends SqlMapDao {
 	 */
 	private void setDataAuth(String name, Object parameters) {
 		// 需要过滤部分sql name，否则会形成死循环
-		String[] serviceFilter = {"HPXSUser", "HPXSOrg", "HPPZ010.query"};
+		String[] serviceFilter = {"HPXSUser", "HPXSOrg", "HPPZ009.query", "HPPZ010.query"};
 		if (StringUtils.startsWithAny(name, serviceFilter)) {
 			return;
 		}
@@ -261,7 +261,7 @@ public class SqlMapDaoLogProxy extends SqlMapDao {
 		}
 		String depAuth = dbPz010.getDepAuth();
 		// 看全部
-		if (AuthTypeEnum.ALL.getCode().equals(customAuth)) {
+		if (AuthTypeEnum.ONLY_COMPANY.getCode().equals(customAuth)) {
 			return Arrays.asList(AuthTypeEnum.ALL.getCode());
 		} else if (AuthTypeEnum.ONLY_FACTORY.getCode().equals(customAuth)) {
 			// 查询当前部门所在的厂及子集

src/main/resources/META-INF/resources/WEB-INF/fragments/foot.jsp

@@ -23,3 +23,4 @@
 </script>
 <script src="${ctx}/common/js/common.js"></script>
 <script src="${ctx}/common/js/jsUtils.js"></script>
+<EF:EFInput cname="parentFormEname" ename="efParentFormEname" type="hidden"/>

src/main/webapp/HP/SC/HPSC002.js

@@ -684,7 +684,7 @@ function openUploadFile(id) {
  */
 function showUploadFile(id) {
 	JSColorbox.open({
-		href: "HPSC002A?methodName=initLoad&efParentFormEname=HPSC002&inqu_status-0-bizType=WL&inqu_status-0-id=" + id,
+		href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType=WL&inqu_status-0-id=" + id,
 		title: "<div style='text-align: center;'>附件清单</div>",
 		width: "80%",
 		height: "80%",

src/main/webapp/HP/SC/HPSC002A.js

@@ -38,6 +38,7 @@ $(window).load(function () {
  * 查询
  */
 var query = function (e) {
+	console.log( __eiInfo);
 	resultGrid.dataSource.page(1);
 }
 

src/main/webapp/common/js/jsUtils.js

@@ -190,8 +190,10 @@
 					href = replacePos(href, (inx + 1), "?");
 				}
 			} else {
-
 			}
+			// 当前页面号
+			let efFormEname = __eiInfo.extAttr[EiConstant.EF_FORM_ENAME];
+			href = href + (href.indexOf("?") == -1 ? '?' : '&') + "efParentFormEname=" + efFormEname;
 			parameter["href"] = href;
 			popWindow = divhtml.data("kendoWindow");
 			popWindow.setOptions({