item：完善orgCode查询条件

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -500,7 +501,9 @@ public class CheckController extends AbstractBaseController {
         params.put("userId", userId);
         params.put("timeType", timeType);
         params.put("result", result);
-        params.put("orderRule", CheckRecordOrderByEnum.getEumByCode(orderRule).getOderBy());
+        if (StringUtils.isNotBlank(orderRule)) {
+            params.put("orderRule", CheckRecordOrderByEnum.getEumByCode(orderRule).getOderBy());
+        }
         params.put("beginTime", beginTime);
         params.put("endTime", endTime);
         params.put("person", person);

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1913,7 +1913,8 @@
                 pp.belong_system_name systemName,
                 pp.address address,
                 pp.original_id equipId,
-                CONCAT(pp.address, pp.building_name) buildingName
+                CONCAT(pp.address, pp.building_name) buildingName,
+                pc.org_code AS orgCode
             FROM p_check pc
             LEFT JOIN p_point pp ON pp.id = pc.point_id
         ) a
@@ -2013,7 +2014,8 @@
         pp.belong_system_id systemId,
         pp.belong_system_name systemName,
         pp.address address,
-        CONCAT(pp.address, pp.building_name) buildingName
+        CONCAT(pp.address, pp.building_name) buildingName,
+        pc.org_code AS orgCode
         FROM p_check pc
         LEFT JOIN p_point pp ON pp.id = pc.point_id
         ) a