blade-common/src/main/java/org/springblade/common/enums/NumberEnum.java

@@ -71,6 +71,12 @@ public enum NumberEnum {
 	 */
 	FIFTEEN(15),
 
+
+	/**
+	 * 20
+	 */
+	TWENTY(20),
+
 	/**
 	 * 50
 	 */

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -1047,6 +1047,7 @@
             pjpf_corps_desc pcd
                 LEFT JOIN pjpf_corps_addr pca ON pcd.id = pca.pid
                 AND pca.default_addres = '1'
+                AND pca.is_deleted = 0
                 AND pca.tenant_id = #{tenantId}
                 LEFT JOIN blade_user bu ON pcd.salesman_id = bu.id
                 inner JOIN (

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/util/PushUtil.java

@@ -51,6 +51,14 @@ public class PushUtil {
 			log.error("用户id：{}没有推送id", userId);
 			return null;
 		}
+		// 必须为true，否则无法推送
+		pushDto.setDev(true);
+		if (pushDto.getContent().length() > NumberEnum.FIFTY.number) {
+			pushDto.setContent(pushDto.getContent().substring(0, 50));
+		}
+		if (pushDto.getTitle().length() > NumberEnum.TWENTY.number) {
+			pushDto.setTitle(pushDto.getTitle().substring(0, 20));
+		}
 		pushDto.setCId(userPush.getCid());
 		pushDto.setRequestId(IdUtil.getSnowflakeNextIdStr());
 		try {
@@ -84,6 +92,9 @@ public class PushUtil {
 		if (pushDto.getContent().length() > NumberEnum.FIFTY.number) {
 			pushDto.setContent(pushDto.getContent().substring(0, 50));
 		}
+		if (pushDto.getTitle().length() > NumberEnum.TWENTY.number) {
+			pushDto.setTitle(pushDto.getTitle().substring(0, 20));
+		}
 		List<UserPushCid> userPushCidList = userPushCidMapper.selectList(new LambdaQueryWrapper<UserPushCid>().in(UserPushCid::getUserId, userIds).eq(UserPushCid::getStatus, 1));
 		if (CollectionUtil.isEmpty(userPushCidList)) {
 			return null;