FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_foton' 到 'FOTON'

Browse Source 
Fix foton

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!5
This commit is contained in:
陈栋
2022-12-14 16:36:01 +08:00
parent b1d5700c48 d5250c0fa6
commit 3332d1e8be
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+1 -1
View File
@@ -63,11 +63,11 @@ public class LoginRestController {
@RequestParam @NotNull(message = "请输入密码") String password, @RequestParam @NotNull(message = "请输入密码") String password,
@RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) throws UnsupportedEncodingException { @RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) throws UnsupportedEncodingException {
UserEO userEO = userService.getUserByLoginNameNotDeleted(username); UserEO userEO = userService.getUserByLoginNameNotDeleted(username);
userEO.setInstitutionNameDepartment(userService.getName(userEO.getInstitutionId()));
if (null == userEO) { if (null == userEO) {
log.info("用户[{}]身份验证失败", username); log.info("用户[{}]身份验证失败", username);
return Result.error("r0011", "您输入的帐号或密码有误"); return Result.error("r0011", "您输入的帐号或密码有误");
} }
userEO.setInstitutionNameDepartment(userService.getName(userEO.getInstitutionId()));
if(userEO.getDisableFlag()==1){ if(userEO.getDisableFlag()==1){
log.info("用户[{}]身份验证失败", username); log.info("用户[{}]身份验证失败", username);
return Result.error("r0011", "您输入的帐号已禁用"); return Result.error("r0011", "您输入的帐号已禁用");
adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java
+2 -2
View File
@@ -100,8 +100,8 @@ public class UpdateStateBussSyncFz implements Runnable {
// 需要更新为作废状态的集合 // 需要更新为作废状态的集合
List<SarBussionessStand> invalidList = getStateScheduledList.stream().filter(info -> { List<SarBussionessStand> invalidList = getStateScheduledList.stream().filter(info -> {
if(StringUtils.isNotBlank(info.getDTQBBHBUSS())){ if(StringUtils.isNotBlank(info.getBDTQBBHBUSS())){
List<String> bdtList = Arrays.stream(info.getDTQBBHBUSS().split(",")).map(String::trim).collect(Collectors.toList()); List<String> bdtList = Arrays.stream(info.getBDTQBBHBUSS().split(",")).map(String::trim).collect(Collectors.toList());
// 现行有效、作废 // 现行有效、作废
List<String> bdtStateList = new ArrayList<>(); List<String> bdtStateList = new ArrayList<>();
// 现行有效 // 现行有效
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+1 -1
View File
@@ -26,7 +26,7 @@ import java.util.List;
@Repository @Repository
public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> { public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
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}";
/** /**
* 自动更新文本状态通用查询 * 自动更新文本状态通用查询