Merge remote-tracking branch 'origin/master'

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/SaveApplyDTO.java

@@ -3,7 +3,6 @@ package org.springblade.archive.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springblade.archive.vo.ArchivesAutoVO2;
 
 import java.io.Serializable;
 import java.time.LocalDate;

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO2.java

@@ -11,12 +11,23 @@ import org.springblade.archive.entity.ArchivesAuto;
  * @description TODO
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class ArchivesAutoVO2 extends ArchivesAuto {
+public class ArchivesAutoVO2  {
 
     @ApiModelProperty("主节点")
     private Long masterNode;
 
     @ApiModelProperty("保管期限名称")
     private String storageTimeValue;
+
+    @ApiModelProperty("档案id")
+    private Long id;
+
+    private String name;
+
+    private String fileNumber;
+
+    private String remark;
+
+    private Integer pageN;
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -661,11 +661,17 @@ public class TaskController extends BladeController {
                                     String name = expertInfo.getName();
                                     dto.setTenantId(AuthUtil.getTenantId());
                                     dto.setAccount("expert" + phone);
+                                    //如果当前账户已经存在,则代表账号已经注册，直接跳过当前
+                                    R<User> r = userClient.userByAccount(AuthUtil.getTenantId(), dto.getAccount());
+                                    if (r.getData() != null){
+                                        continue;
+                                    }
                                     StringSPUtils stringSPUtils = new StringSPUtils();
                                     dto.setPassword(stringSPUtils.getStringSP(name).toLowerCase(Locale.ROOT) + phone);
                                     dto.setUserType("3");
                                     dto.setRealName(name);
                                     dto.setPhone(phone);
+                                    //设置专家部门
                                     dto.setDeptId(AuthUtil.getDeptId());
                                     dto.setStatus(1);
                                     List<SaveUserInfoByProjectDTO> list = new ArrayList<>();