修改代码

admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java

@@ -218,6 +218,10 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 				if (CollUtil.isEmpty(salesmanUserIdList)) throw new BadRequestException("下发人员不能为空!");
 				Map<Long, List<SysUser>> listMap = sysUserService.listByUserIds(salesmanUserIdList).stream().collect(Collectors.groupingBy(SysUser::getUserId));
 				for (Long userId : salesmanUserIdList) {
+					Long countResult = clueService.findByAssignedByIdAndNid(userId, phone);
+					if (ObjectUtil.isNotNull(countResult) && countResult > DefaultNumberConstants.ZERO_NUMBER) {
+						throw new BadRequestException("该资源已分发,请勿重复操作!");
+					}
 					String username = listMap.get(userId).get(0).getUsername();
 					// 扣减余额
 					Boolean result = sysUserService.deductionQuantity(userId, null);

admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java

@@ -30,12 +30,12 @@ public class ClueVO {
 
 
 	@Schema(title = "线索来源")
-	@ExcelProperty(value = "线索来源名称", index = 1)
+	// @ExcelProperty(value = "线索来源名称", index = 1)
 	private String originName;
 
 
 	@Schema(title = "线索备注")
-	@ExcelProperty(value = "线索备注", index = 2)
+	@ExcelProperty(value = "线索备注", index = 1)
 	private String remark;
 
 	@ExcelIgnore
@@ -56,7 +56,7 @@ public class ClueVO {
 	private String clueTime;
 
 	@Schema(title = "资源标签")
-	@ExcelProperty(value = "资源标签", index = 6)
+	@ExcelProperty(value = "资源标签", index = 5)
 	private String clueLabel;
 
 	@ExcelIgnore
@@ -65,7 +65,7 @@ public class ClueVO {
 
 
 	@Schema(title = "创建时间")
-	@ExcelProperty(value = "线索时间", converter = LocalDateTimeConverter.class, index = 5)
+	@ExcelProperty(value = "线索时间", converter = LocalDateTimeConverter.class, index = 4)
 	private LocalDateTime createTime;
 
 	@ExcelIgnore
@@ -80,7 +80,7 @@ public class ClueVO {
 	@Schema(title = "资源线索名称")
 	private String clueStageName;
 
-	@ExcelProperty(value = "资源标签集合", converter = CustomStringStringConverter.class, index = 7)
+	@ExcelProperty(value = "资源标签集合", converter = CustomStringStringConverter.class, index = 6)
 	@Schema(title = "资源标签集合")
 	private List<String> clueLabelList;
 
@@ -96,12 +96,12 @@ public class ClueVO {
 	@Schema(title = "阶段信息")
 	List<ClueStageEntity> clueStageEntities;
 
-	@ExcelProperty(value = "性别", converter = SexConverter.class, index = 4)
+	@ExcelProperty(value = "性别", converter = SexConverter.class, index = 3)
 	@Schema(title = "性别(0-男，1-女)")
 	private Integer sex;
 
 	@Schema(title = "客户资料")
-	@ExcelProperty(value = "客户资料", index = 3)
+	@ExcelProperty(value = "客户资料", index = 2)
 	private String customInformation;
 
 	@ExcelIgnore

admin/src/main/resources/mapper/CustomMapper.xml

@@ -25,12 +25,11 @@
 
 	<select id="selectByPage" resultType="com.baiye.modules.distribute.vo.CustomVO">
 		SELECT
-		DISTINCT
 		<include refid="Base_Alias_Column_List"/>
 		FROM
 		tb_custom cm
 		${ew.customSqlSegment}
-		order by cm.update_time desc,cm.create_time desc, cm.custom_id desc
+		order by cm.update_time desc,cm.create_time desc
 	</select>
 
 	<select id="selectMaxBatchNoByCompanyId" resultType="java.lang.String">