From 762a0847ebe0a5ef73690fe4e03859610e944802 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 28 Jul 2023 09:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml | 4 ++-- .../src/main/java/com/njcn/user/pojo/param/UserParam.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml index 5a2a4c30f..c00e3f6d8 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml @@ -111,8 +111,8 @@ sum(is_i_48) i48OverDay, sum(is_i_49) i49OverDay, sum(is_i_50) i50OverDay, - sum(is_unbalance), - sum(is_i_neg) + sum(is_unbalance) unbalanceOverDay, + sum(is_i_neg) iNegOverDay from r_mp_part_harmonic_detail_d where diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java index 1fea2ec95..2d9dbbc64 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java @@ -100,8 +100,7 @@ public class UserParam { private String loginName; @ApiModelProperty("用户表Id") - @NotBlank(message = UserValidMessage.ID_NOT_BLANK) - @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR) + @NotNull(message = UserValidMessage.ID_NOT_BLANK) private String id; }