update

src/main/java/com/ydool/staff/entity/Organization.java

@@ -58,6 +58,9 @@ public class Organization extends BaseEntity{
     @ApiModelProperty(value = "类型")
     private String type;
 
+    @ApiModelProperty(value = "单据状态")
+    private String documentStatus;
+
     @ApiModelProperty(value = "修改人")
     @TableField(exist = false)
     private String updatedName;

src/main/java/com/ydool/staff/entity/PersonnelIndicators.java

@@ -52,4 +52,6 @@ public class PersonnelIndicators extends BaseEntity {
     @ApiModelProperty(value = "编办意见")
     private String arrangeFor;
 
+    @ApiModelProperty(value = "单据状态")
+    private String documentStatus;
 }

src/main/java/com/ydool/staff/entity/Recruitment.java

@@ -53,6 +53,9 @@ public class Recruitment extends BaseEntity {
     @ApiModelProperty(value = "终审意见")
     private String lastInstance;
 
+    @ApiModelProperty(value = "单据状态")
+    private String documentStatus;
+
     @ApiModelProperty(value = "企业名称")
     @TableField(exist = false)
     private String companyName;

src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydool.staff.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -66,6 +67,9 @@ public class DirectorsSupervisorsServiceImpl extends BaseService<DirectorsSuperv
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult saveDirectorsSupervisors(DirectorsSupervisors directorsSupervisors) {
+        if (!IdcardUtil.isValidCard(directorsSupervisors.getIdentityCard())) {
+            return AjaxResult.fail().msg("身份证号格式不正确！");
+        }
         List<String> list = new ArrayList<>();
         List<AttachmentDto> attachmentList = directorsSupervisors.getAttachmentDtoList();
         for (AttachmentDto attachment : attachmentList) {

src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java

@@ -34,6 +34,8 @@ public class OrganizationServiceImpl extends BaseService<OrganizationMapper, Org
     OrganizationMapper organizationMapper;
     @Autowired
     UserMapper userMapper;
+    @Autowired
+    CompanyNameMapper companyNameMapper;
 
     @Override
     public AjaxResult selectOrganizationList(Page<Organization> page, OrganizationSearch organizationSearch) {
@@ -44,6 +46,7 @@ public class OrganizationServiceImpl extends BaseService<OrganizationMapper, Org
         Page<Organization> selectPage = organizationMapper.selectPage(page, organizationLambdaQueryWrapper);
         for (Organization record : selectPage.getRecords()) {
             record.setUpdatedName(userMapper.selectById(record.getUpdatedId()).getUserName());
+            record.setCompanyId(companyNameMapper.selectById(record.getCompanyId()).getCompanyName());
         }
         return AjaxResult.ok().data(selectPage);
     }