From d7554bf5149e77d913556b7e9243b4c3a629e474 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 14 Dec 2022 13:42:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E6=81=A2?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/scheduledState/server/UpdateStateBussSyncFz.java | 4 ++-- .../da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java index 8e96fabe..965bda7e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java @@ -100,8 +100,8 @@ public class UpdateStateBussSyncFz implements Runnable { // 需要更新为作废状态的集合 List invalidList = getStateScheduledList.stream().filter(info -> { - if(StringUtils.isNotBlank(info.getDTQBBHBUSS())){ - List bdtList = Arrays.stream(info.getDTQBBHBUSS().split(",")).map(String::trim).collect(Collectors.toList()); + if(StringUtils.isNotBlank(info.getBDTQBBHBUSS())){ + List bdtList = Arrays.stream(info.getBDTQBBHBUSS().split(",")).map(String::trim).collect(Collectors.toList()); // 现行有效、作废 List bdtStateList = new ArrayList<>(); // 现行有效 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index eafe5ffa..49cef6a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -26,7 +26,7 @@ import java.util.List; @Repository public interface SarBussionessStandDao extends BaseMapper { - String updateStateScheduledSql = "SELECT A.*,B.DTQBBHBUSS FROM sar_bussioness_stand A LEFT JOIN sar_buss_stand_attr_info B ON B.STAND_ID = A.ID ${ew.customSqlSegment}"; + String updateStateScheduledSql = "SELECT A.*,B.BDTQBBHBUSS FROM sar_bussioness_stand A LEFT JOIN sar_buss_stand_attr_info B ON B.STAND_ID = A.ID ${ew.customSqlSegment}"; /** * 自动更新文本状态通用查询 From 893163661988d02c9a70302634bd57dffd2cd308 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 14 Dec 2022 14:17:07 +0800 Subject: [PATCH 2/2] bug63687 --- .../main/java/com/adc/da/login/rest/LoginRestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index bb8e2292..0f93f85a 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -63,11 +63,11 @@ public class LoginRestController { @RequestParam @NotNull(message = "请输入密码") String password, @RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) throws UnsupportedEncodingException { UserEO userEO = userService.getUserByLoginNameNotDeleted(username); - userEO.setInstitutionNameDepartment(userService.getName(userEO.getInstitutionId())); if (null == userEO) { log.info("用户[{}]身份验证失败", username); return Result.error("r0011", "您输入的帐号或密码有误"); } + userEO.setInstitutionNameDepartment(userService.getName(userEO.getInstitutionId())); if(userEO.getDisableFlag()==1){ log.info("用户[{}]身份验证失败", username); return Result.error("r0011", "您输入的帐号已禁用");