yangdamao 2 سال پیش
والد
کامیت
259dc0ce24

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -178,6 +178,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
         lqw.eq(bo.getPosterTempId() != null, DistributionActivityTemplate::getPosterTempId, bo.getPosterTempId());
         lqw.eq(bo.getStartTime() != null, DistributionActivityTemplate::getStartTime, bo.getStartTime());
         lqw.eq(bo.getEndTime() != null, DistributionActivityTemplate::getEndTime, bo.getEndTime());
+        lqw.orderByDesc(DistributionActivityTemplate::getCreateTime);
         List<DistributionActivityTemplateVo> voList = entity2Vo(this.list(lqw));
         if (CollectionUtils.isEmpty(voList)){
             return new ArrayList<>();

+ 2 - 2
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -892,7 +892,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  WHERE
                      cg.official_name = #{officialName}
                    AND cgu.`status` = 1
---                    AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cgu.tenant_id AND sog.share_class = 1) > 0
+                   AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cgu.tenant_id AND sog.share_class = 1) > 0
              ) + (
                  SELECT
                      count(*)
@@ -902,7 +902,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  WHERE
                      cg.official_name = #{officialName}
                    AND cgu.`status` = 1
---                    AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cgu.tenant_id AND sog.share_class = 1) > 0
+                   AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cgu.tenant_id AND sog.share_class = 1) > 0
              ))
 
     </select>