Merge branch 'master' of https://gitlab.sunboxauto.com/tianchao/gf_back

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysOrganizationViewMapper.xml

@@ -224,7 +224,9 @@
     <select id="selectListByOuIds" parameterType="java.util.List" resultMap="BaseResultMap">
         select r.ou_id as id,r.parent_ou_id,s.ou_name,s.short_name from sys_organization_rel r
         left join sys_organization s on r.ou_id = s.id
-        where s.is_deleted = 1 and r.ou_id in
+        where s.is_deleted = 1
+        AND r.effect_time &lt;= now() AND r.end_time &gt;= now()
+        and r.ou_id in
         <foreach collection="list" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeBaseService.java

@@ -432,6 +432,9 @@ public class SpaceOptimizeBaseService {
                             int powerDuration = avg.getPowerDuration();
                             powerDuration = powerDuration > 15 ? 15 : powerDuration;
                             String offset = createTime.offsetNew(DateField.MINUTE, powerDuration).toString(BusinessConstant.MINUTES_FORMAT);
+                            if (StringUtils.equals(offset, BusinessConstant.START_OF_DAY_TIME)) {
+                                offset = BusinessConstant.END_OF_DAY_TIME;
+                            }
                             if (0 != powerDuration) {
                                 //储能发电时长
                                 this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.STORED_ENERGY,