2024-05-27 修复设备管理因用户层级无法查询所属公司问题修复

src/main/java/com/baosight/hggp/hg/sb/domain/HGSB001.java

@@ -4,6 +4,7 @@ import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import com.baosight.iplat4j.core.util.StringUtils;
 
@@ -493,7 +494,7 @@ public class HGSB001 extends DaoEPBase {
 	 * @return the deviceCode
 	 */
 	public String getDeviceCode() {
-		return this.deviceCode;
+		return this.deviceCode.toUpperCase(Locale.ROOT);
 	}
 
 	/**
@@ -502,7 +503,7 @@ public class HGSB001 extends DaoEPBase {
 	 * @param deviceCode - 设备编码
 	 */
 	public void setDeviceCode(String deviceCode) {
-		this.deviceCode = deviceCode;
+		this.deviceCode = deviceCode.toUpperCase(Locale.ROOT);
 	}
 	/**
 	 * get the deviceName - 设备名称.

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB002.java

@@ -10,6 +10,7 @@ import com.baosight.hggp.hg.sb.domain.HGSB002A;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.hggp.hg.sb.domain.HGSB002;
@@ -38,11 +39,11 @@ public class ServiceHGSB002 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB002.QUERY, new HGSB002());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB003.java

@@ -9,8 +9,10 @@ import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sb.domain.HGSB002;
 import com.baosight.hggp.hg.sb.domain.HGSB003;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.sj.domain.HGSJ002A;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.ErrorCodeUtils;
 import com.baosight.hggp.util.LogUtils;
@@ -23,6 +25,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -41,18 +44,31 @@ public class ServiceHGSB003 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB003.QUERY, new HGSB003());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
         qarma.clear();
-        Map userCompany = HGSBTools.getUserCompany();
-        qarma.put(HGSB003.FIELD_COMPANY_CODE,userCompany.get(HGSB002.FIELD_COMPANY_CODE));
+
+        if (CollectionUtils.isNotEmpty(orgList)){
+            Org org = orgList.get(0);
+            if (!"company".equals(org.getOrgType())) {
+                //如果不是公司公司，则找到上一级
+                List<Org> orgList1 = HGXSTools.XsOrg.queryParent(org.getOrgId());
+                for (Org org1:orgList1) {
+                    if ("company".equals(org1.getOrgType()) && !"root".equals(org1.getParentOrgId())) {
+                        qarma.put(HGSB003.FIELD_COMPANY_CODE,org1.getOrgId());
+                    }
+                }
+            }else {
+                qarma.put(HGSB003.FIELD_COMPANY_CODE,org.getOrgId());
+            }
+        }
         qarma.put(HGSB003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID), qarma);
         return outInfo;

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004.java

@@ -12,6 +12,7 @@ import com.baosight.hggp.hg.sb.domain.HGSB004;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.ErrorCodeUtils;
 import com.baosight.hggp.util.LogUtils;
@@ -42,11 +43,11 @@ public class ServiceHGSB004 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB004.QUERY, new HGSB004());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
         /*Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004B.java

@@ -10,6 +10,7 @@ import com.baosight.hggp.hg.sb.domain.*;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -36,11 +37,11 @@ public class ServiceHGSB004B extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002.FIELD_PLAN_STATUS, CommonConstant.YesNo.YES_1);
         inInfo = super.query(inInfo, HGSB002.QUERY, new HGSB002());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
         Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB005.java

@@ -12,6 +12,7 @@ import com.baosight.hggp.hg.sb.domain.HGSB005;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -39,11 +40,11 @@ public class ServiceHGSB005 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB005.QUERY, new HGSB005());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB006.java

@@ -6,7 +6,9 @@ import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.sb.domain.HGSB004;
 import com.baosight.hggp.hg.sb.domain.HGSB006;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -15,6 +17,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,11 +33,11 @@ public class ServiceHGSB006 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_INIT_CHECK_STATUS, CommonConstant.YesNo.YES_1);
         outInfo = super.query(inInfo, HGSB006.QUERY, new HGSB006());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
         //outInfo.getBlock(EiConstant.queryBlock).removeCol(HGSB004.FIELD_CHECK_STATUS);
         return outInfo;

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB007.java

@@ -8,7 +8,9 @@ import com.baosight.hggp.hg.sb.domain.HGSB004;
 import com.baosight.hggp.hg.sb.domain.HGSB005;
 import com.baosight.hggp.hg.sb.domain.HGSB007;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlockMeta;
@@ -18,6 +20,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,11 +36,11 @@ public class ServiceHGSB007 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_CHECK_STATUS, CommonConstant.YesNo.YES_1);
         outInfo = super.query(inInfo, HGSB007.QUERY, new HGSB007(),false, new HGSB007().eiMetadata, EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL);
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
         return outInfo;
     }

src/main/java/com/baosight/hggp/hg/sb/tools/HGSBTools.java

@@ -47,7 +47,7 @@ public class HGSBTools {
             if (!org.getOrgType().equals("company")) {
                 //如果不是公司公司，则找到上一级
                 Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
-                orgMap.put(HGSB002.FIELD_COMPANY_CODE,org.getOrgId());
+                orgMap.put(HGSB002.FIELD_COMPANY_CODE,org1.getOrgId());
             }else {
                 orgMap.put(HGSB002.FIELD_COMPANY_CODE, org.getOrgId());
             }

src/main/webapp/HG/SB/HGSB001.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");

src/main/webapp/HG/SB/HGSB002.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 

src/main/webapp/HG/SB/HGSB002.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="设备区域" placeholder="模糊查询" colWidth="3"/>
                 <%--<EF:EFSelect blockId="inqu_status" row="0" ename="groupCode" cname="设备区域" colWidth="3" filter="contains">
@@ -55,7 +55,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"

src/main/webapp/HG/SB/HGSB003.js

 $(function () {
 
     var deviceCodeBox = __eiInfo.getBlock("deviceCodeBox_block_id").getMappedRows();
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");

src/main/webapp/HG/SB/HGSB003.jsp

@@ -21,7 +21,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="applyDate" cname="申请日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -42,7 +42,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="applyDate" cname="申请日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB004.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     //var groupCodeBox = __eiInfo.getBlock("groupCodeBox_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 

src/main/webapp/HG/SB/HGSB004.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="inspecDate" cname="点检日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -42,7 +42,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="inspecDate" cname="点检日期" width="120" enable="true" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB004B.jsp

@@ -25,7 +25,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="设备区域" placeholder="模糊查询" colWidth="3"/>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="planDate" cname="计划日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -47,7 +47,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"

src/main/webapp/HG/SB/HGSB005.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     //var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 

src/main/webapp/HG/SB/HGSB005.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="upkeepDate" cname="保养日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -41,7 +41,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="upkeepDate" cname="保养日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB006.jsp

@@ -17,7 +17,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="checkStatus" cname="点检状态" colWidth="3" filter="contains">
@@ -37,7 +37,7 @@
                                   textField="textField" valueField="valueField"
                                   maxLength="16" readonly="true" width="120" required="true"
                                   align="center" filter="contains" sort="true">
-                    <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                    <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
                 </EF:EFComboColumn>
                 <EF:EFColumn ename="planCode" cname="计划单号" width="100" enable="false" readonly="true" align="center" required="true"/>
                 <EF:EFComboColumn ename="deviceCode" cname="设备名称"

src/main/webapp/HG/SB/HGSB007.jsp

@@ -18,7 +18,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="upkeepStatus" cname="保养状态" colWidth="3" filter="contains">
@@ -37,7 +37,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="planCode" cname="计划单号" width="120" align="center" readonly="true" required="true"/>
             <EF:EFComboColumn ename="deviceCode" cname="设备名称"