人员配置选人修改

sop-api/src/main/java/com/qmth/sop/server/api/TBUserArchivesAllocationController.java

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import java.util.Objects;
 
 /**
  * <p>
@@ -168,6 +169,7 @@ public class TBUserArchivesAllocationController {
     public Result findCanChoose(@ApiParam(value = "派单详情id", required = true) @RequestParam String crmDetailId,
             @ApiParam(value = "sop角色身份", required = true) @RequestParam SopRoleTypeCompositeEnum sopRoleType) {
         CrmProjectResult crmProjectResult = tbCrmService.findCrmProjectInfo(null, Long.parseLong(crmDetailId), null);
+        Objects.requireNonNull(crmProjectResult, "未找到派单信息");
         return ResultUtil.ok(tbUserArchivesAllocationService.findCanChooseArchives(crmProjectResult.getCustomType(),
                 SystemConstant.convertIdToLong(crmDetailId), sopRoleType));
     }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesAllocationServiceImpl.java

@@ -628,7 +628,34 @@ public class TBUserArchivesAllocationServiceImpl
                 }
             }
         } else {
+            CrmProjectResult crmProjectResult = tbCrmService.findCrmProjectInfo(null, crmDetailId, null);
+            Objects.requireNonNull(crmProjectResult, "未找到派单信息");
 
+            UserArchivesResult tbUserArchivesResult = tbUserArchivesService.findUserArchivesByArchivesIdORUserId(null,
+                    crmProjectResult.getRegionManagerId());
+            UserArchivesDto cell = new UserArchivesDto();
+            if (Objects.nonNull(tbUserArchivesResult)) {
+                cell.setUserId(tbUserArchivesResult.getUserId());
+                cell.setUserArchivesId(tbUserArchivesResult.getUserArchivesId());
+                cell.setName(tbUserArchivesResult.getName());
+                cell.setProvince(tbUserArchivesResult.getProvince());
+                cell.setCity(tbUserArchivesResult.getCity());
+                cell.setSupplierName(tbUserArchivesResult.getSupplierName());
+                cell.setMobileNumber(tbUserArchivesResult.getMobileNumber());
+                List<RoleResult> roleInfoList = tbUserArchivesResult.getRoleInfoList();
+                if (CollectionUtils.isNotEmpty(roleInfoList)) {
+                    cell.setArchivesRoleName(
+                            roleInfoList.stream().map(RoleResult::getRoleName).collect(Collectors.joining(",")));
+                }
+                result.add(cell);
+            } else {
+                SysUser sysUser = sysUserService.getById(crmProjectResult.getRegionManagerId());
+                cell.setUserId(crmProjectResult.getRegionManagerId());
+                cell.setName(sysUser.getRealName());
+                cell.setMobileNumber(sysUser.getMobileNumber());
+                cell.setArchivesRoleName(SopRoleTypeCompositeEnum.REGION_MANAGER.getTitle());
+                result.add(cell);
+            }
         }
         return result;
     }