机场巡检记录改造

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -1126,15 +1126,15 @@ public class PointServiceImpl implements IPointService {
         Map<String, Object> resp = new HashMap<String, Object>();
         Map<String, Object> point = pointMapper.getPointById(id);
 
-        if (StringUtil.isNotEmpty(point.get("depid"))) {
-            List<LinkedHashMap> departmentBos = remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, point.get("depid") + "");
-            if (departmentBos != null && departmentBos.size() > 0) {
-                for (int i = 0; i < departmentBos.size(); i++) {
-                    point.put("departmentName", departmentBos.get(i).get("departmentName"));
-                }
-            }
-
-        }
+//        if (StringUtil.isNotEmpty(point.get("depid"))) {
+//            List<LinkedHashMap> departmentBos = remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, point.get("depid") + "");
+//            if (departmentBos != null && departmentBos.size() > 0) {
+//                for (int i = 0; i < departmentBos.size(); i++) {
+//                    point.put("departmentName", departmentBos.get(i).get("departmentName"));
+//                }
+//            }
+//
+//        }
 
         // deptName = checkPointBo.getExecuteDeptId();
         if (StringUtil.isNotEmpty(point.get("userName"))) {

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -338,6 +338,7 @@
 		END) fixed,
 		p.charge_person_name userName,
 		p.charge_dept_id depid,
+		p.biz_org_name departmentName,
 		IFNULL(p.risk_source_id, '') as buildingId,
 		p.remark,
 		p.offline