Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -33,6 +33,7 @@ import com.jero.modules.utils.HanYuPinYinUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -186,6 +187,17 @@ public class SysDictController {
 				ls = sysDictService.queryDictItemsByCode(dictCode);
 			}
 
+			// 将结果集进行排序
+			if (CollectionUtils.isNotEmpty(ls)) {
+				// 匿名比较器排序
+				Collections.sort(ls, new Comparator<DictModel>() {
+					@Override
+					public int compare(DictModel p1, DictModel p2) {
+						return p1.getText().compareTo(p2.getText());
+					}
+				});
+			}
+
 			result.setSuccess(true);
 			result.setResult(ls);
 			log.debug(result.toString());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java

@@ -338,7 +338,7 @@ public class CertificationInventoryJob implements Job {
             // 只要早于当前日期都算逾期
             boolean flag = false;
             if(data.getEndTime() != null){
-                flag = (data.getEndTime().before(currentDate));
+                flag = (data.getEndTime().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getEndTime())));
             }
             return flag;
         }).collect(Collectors.toList());