Browse Source

fix 证书

he2802 3 years ago
parent
commit
e3d33e0eef

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateServiceImpl.java

@@ -96,7 +96,7 @@ public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certi
      */
     private void validEntityBeforeSave(Certificate entity){
         //TODO 做一些数据校验,如唯一约束
-        if(checkNameUnique(entity)&&Validator.isEmpty(entity.getId())){
+        if(checkNameUnique(entity)){
             throw new CustomException("名称重复");
         }
     }

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

@@ -323,10 +323,10 @@
             and cgu.period_status = #{periodStatus}
         </if>
         <if test="classStartTime != null and classStartTime != '' ">
-            AND cg.class_start_time > #{classStartTime}
+            AND cg.class_start_time >= #{classStartTime}
         </if>
         <if test="classEndTime != null and classEndTime != '' ">
-            AND #{classEndTime} >  cg.class_end_time
+            AND #{classEndTime} >=  cg.class_end_time
         </if>
         <if test="studyStatus != null and studyStatus == 1 ">
             and cgu.period_status = -1