bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/param/QueryParamUtil.java

 package com.yeejoin.amos.fas.business.param;
 
-import java.util.List;
-
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
 
 
 public class QueryParamUtil {
@@ -14,6 +15,7 @@ public class QueryParamUtil {
         for (int i = 0; i < queryRequests.size(); i++) {
             String name = queryRequests.get(i).getName();
             String value = toString(queryRequests.get(i).getValue());
+            if (!StringUtils.isEmpty(value)) {
                 if ("departmentId".equals(name)) {
                     param.setDepartmentId(Long.valueOf(value));
                 } else if ("pointNo".equals(name)) {
@@ -30,6 +32,7 @@ public class QueryParamUtil {
                     param.setBindingPointIds(value.split(","));
                 }
             }
+        }
         if (commonPageable != null) {
             param.setPageNumber(commonPageable.getPageNumber());
             param.setPageSize(commonPageable.getPageSize());

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fmea.xml

@@ -33,6 +33,7 @@
 			femo.coefficient AS evaluationO,
 			femd.coefficient AS evaluationD,
 		    fm.rpni,
+			fm.rpn,
 		    fm.engineering,
 		    fm.management,
 		    fm.train,

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_source.xml

@@ -394,6 +394,7 @@
 				rl.`name` as level,
 				rs.risk_level_id,
 				rs.rpni,
+				rs.rpn,
 				rs.is_region,
 				rs.floor3d,
 				rs.is_indoor,