Merge remote-tracking branch 'origin/main'

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java

@@ -119,7 +119,9 @@ public class KhPingceController extends BaseController
             query.setPcId(khPingce.getId());
             List<KhPcEmp> temItems = pcEmpService.selectKhPcEmpList(query);
             List<Long> ids = temItems.stream().map(KhPcEmp::getId).collect(Collectors.toList());
-            pcEmpService.deleteKhPcEmpByIds(ids.toArray(new Long[ids.size()]));
+            if(ids!=null&&ids.size()>0){
+                pcEmpService.deleteKhPcEmpByIds(ids.toArray(new Long[ids.size()]));
+            }
             //增加新的关联
             for(KhEmployee item:pcEmps){
                 KhPcEmp pcEmp = new KhPcEmp();

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 投票记录对象 kh_vote_recard
@@ -50,8 +51,9 @@ public class KhVoteRecard extends BaseEntity
     private BigDecimal voteScore;
 
     /** 投票时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "投票时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "投票时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date voteTime;
 
     /** IP地址 */