""

tofly-zhongming-gas/service/zmrq/src/main/java/com/tofly/zmrq/custom/controller/CustomPlanController.java

@@ -228,7 +228,8 @@ public class CustomPlanController {
                                           @RequestParam(value = "sid", required = false) String sid,
                                           @RequestParam(value = "startTime", required = false) String startTime,
                                           @RequestParam(value = "endTime", required = false) String endTime) {
-        return ResultRespone.success(customPlanService.getChildPlanInfo(childPlanId, sid, startTime, endTime));
+        Long companyId = schedulerService.getCompanyId(SecurityUtils.getUserId());
+        return ResultRespone.success(customPlanService.getChildPlanInfo(childPlanId, sid, startTime, endTime, companyId));
     }
 
 

tofly-zhongming-gas/service/zmrq/src/main/java/com/tofly/zmrq/custom/mapper/CustomPlanMapper.java

@@ -23,7 +23,8 @@ public interface CustomPlanMapper {
      List<Map> getChildPlanInfo(@Param("childPlanId") Long childPlanId,
                                 @Param("sid") String sid,
                                 @Param("startTime") String startTime,
-                                @Param("endTime") String endTime);
+                                @Param("endTime") String endTime,
+                                @Param("companyId") Long companyId);
      Long getPlanTempMaxId(@Param("tableName") String tableName);
 
      void insertBacthPointTemp(@Param("pointTempList") List<PlanPointTemp> pointTempList);

tofly-zhongming-gas/service/zmrq/src/main/java/com/tofly/zmrq/custom/service/CustomPlanService.java

@@ -41,7 +41,7 @@ public interface CustomPlanService {
 
     List<Map> getPointNum(PointNumSearch pointNumSearch);
 
-    List<Map> getChildPlanInfo(Long childPlanId, String sid, String startTime, String endTime);
+    List<Map> getChildPlanInfo(Long childPlanId, String sid, String startTime, String endTime, Long companyId);
 
     boolean updatePlanCheckingPeople(Long planChildId,Long userId,String synergyUserIds);
 }

tofly-zhongming-gas/service/zmrq/src/main/java/com/tofly/zmrq/custom/service/impl/CustomPlanServiceImpl.java

@@ -1090,8 +1090,8 @@ public class CustomPlanServiceImpl implements CustomPlanService {
     }
 
     @Override
-    public List<Map> getChildPlanInfo(Long childPlanId, String sid, String startTime, String endTime) {
-        return customPlanMapper.getChildPlanInfo(childPlanId, sid, startTime, endTime);
+    public List<Map> getChildPlanInfo(Long childPlanId, String sid, String startTime, String endTime, Long companyId) {
+        return customPlanMapper.getChildPlanInfo(childPlanId, sid, startTime, endTime, companyId);
     }
 
     @Override

tofly-zhongming-gas/service/zmrq/src/main/resources/customMapper/CustomPlanMapper.xml

@@ -896,8 +896,9 @@
             left join tf_sys_device_type de on de.point_type_id = a.device_type_id
             left join TF_XJ_TYG f on f.CHILD_PLAN_ID = b.child_plan_id and f.PLAN_TEMP_POINT_ID = b.POINT_ID
             left join tf_xj_ldtyx g on g.CHILD_PLAN_ID = b.child_plan_id and g.PLAN_TEMP_POINT_ID = b.POINT_ID
+            left join TF_SMPN_USER_X h on h.ID = a.USER_ID
         where
-            1=1
+            h.COMPANY_ID = #{companyId}
         <if test="childPlanId != null">
             AND a.id = #{childPlanId}
         </if>