弹出设备窗口的bug

src/main/java/org/rcisoft/business/system/dao/DeviceParamRepository.java

@@ -24,9 +24,9 @@ public interface DeviceParamRepository {
      */
     @Select("<script>select d.PARAM,p.PARAM_NM,p.P_SOURCE,p.P_MIN,p.P_MAX,p.SYMBOL,p.FLAG,p.PARAM_UNIT,d.PARAM_CODE " +
             "from bus_device_param d,bus_devicetp_param p " +
-            "where d.PARAM_CODE=p.PARAM_CODE and d.DEV_NUM=#{devNum} order by p.PARAM_NM</script>")
+            "where d.PARAM_CODE=p.PARAM_CODE and d.DEV_NUM=#{devNum} and p.PRO_ID=#{proId} order by p.PARAM_NM</script>")
     @ResultMap("BaseResultMap")
-    List<DeviceParam> selectDeviceParamList(@Param("devNum") String devNum);
+    List<DeviceParam> selectDeviceParamList(@Param("devNum") String devNum, @Param("proId") String proId);
 
     @Select("<script>select OTHER_PARAM from bus_param_refer where PRO_ID=#{proId} and OWN_PARAM='sensor'</script>")
     @ResultType(String.class)

src/main/java/org/rcisoft/business/system/service/impl/SystemServiceImpl.java

@@ -148,7 +148,6 @@ public class SystemServiceImpl implements SystemService {
 
     @Override
     public Map<String, Object> selectDeviceParamList(String devNum) {
-        List<DeviceParam> list = deviceParamRepository.selectDeviceParamList(devNum);
         // 表具的键
         String devCode = "";
         // 电量的键
@@ -162,6 +161,7 @@ public class SystemServiceImpl implements SystemService {
             devParam = deviceMap.get("devParam");
             proId = deviceMap.get("proId");
         }
+        List<DeviceParam> list = deviceParamRepository.selectDeviceParamList(devNum, proId);
         // 如果不为空，需要将devCode截取一下
         if (StringUtils.isNotEmpty(devCode) && StringUtils.isNotEmpty(devParam) && StringUtils.isNotEmpty(proId))
             devCode = devCode.split(proId + "_")[1];