Showing
3 changed files
with
11 additions
and
3 deletions
| ... | @@ -18,8 +18,8 @@ public interface SysUserRepository extends JpaSpecificationExecutor<SysUser>, Jp | ... | @@ -18,8 +18,8 @@ public interface SysUserRepository extends JpaSpecificationExecutor<SysUser>, Jp |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | - @Query(nativeQuery = true, value = "select * from t_au_user where login_name = ?1") | 21 | + @Query(nativeQuery = true, value = "select TOP 1 * from t_au_user where login_name = ?1 ") |
| 22 | - public List<SysUser> findByLoginName(String loginName); | 22 | + public SysUser findByLoginName(String loginName); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 根据用户登录名list查询用户列表信息 | 25 | * 根据用户登录名list查询用户列表信息 | ... | ... |
| ... | @@ -503,6 +503,13 @@ public class ChmConsignmentService { | ... | @@ -503,6 +503,13 @@ public class ChmConsignmentService { |
| 503 | //2、校验 7天+运单 ,如果有数据并且 还未报关就更新,如果数据就插入 | 503 | //2、校验 7天+运单 ,如果有数据并且 还未报关就更新,如果数据就插入 |
| 504 | ChmConsignment chmConsignmentDB=this.findChmConsignmentByConsignmentCode(chmConsignment.getConsignmentCode(), DateUtils.addDate(DateUtils.getCurrentDate(),-7)); | 504 | ChmConsignment chmConsignmentDB=this.findChmConsignmentByConsignmentCode(chmConsignment.getConsignmentCode(), DateUtils.addDate(DateUtils.getCurrentDate(),-7)); |
| 505 | 505 | ||
| 506 | + //获取用户账号信息 | ||
| 507 | + SysUser sysUser = sysUserRepository.findByLoginName("CUSTOMS"); | ||
| 508 | + //设置当前运单创建人ID | ||
| 509 | + chmConsignment.setCreatorId(sysUser); | ||
| 510 | + //设置创建人名称 | ||
| 511 | + chmConsignment.setCreator(sysUser.getUserName()); | ||
| 512 | + | ||
| 506 | //3、新增或更新 | 513 | //3、新增或更新 |
| 507 | //新增:如果没有就插入 | 514 | //新增:如果没有就插入 |
| 508 | if (Objects.equals(chmConsignmentDB,null)){ | 515 | if (Objects.equals(chmConsignmentDB,null)){ |
| ... | @@ -538,6 +545,7 @@ public class ChmConsignmentService { | ... | @@ -538,6 +545,7 @@ public class ChmConsignmentService { |
| 538 | } | 545 | } |
| 539 | 546 | ||
| 540 | chmConsignment.setId(chmConsignmentDB.getId()); | 547 | chmConsignment.setId(chmConsignmentDB.getId()); |
| 548 | + | ||
| 541 | chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime()); | 549 | chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime()); |
| 542 | chmConsignment.setUpdateTime(pushTime); | 550 | chmConsignment.setUpdateTime(pushTime); |
| 543 | ChmConsignment updateResult = this.saveChmConsignment(chmConsignment); | 551 | ChmConsignment updateResult = this.saveChmConsignment(chmConsignment); | ... | ... |
| ... | @@ -48,7 +48,7 @@ public class SHA256Util { | ... | @@ -48,7 +48,7 @@ public class SHA256Util { |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | public static void main(String[] args){ | 50 | public static void main(String[] args){ |
| 51 | - String secretKey = "BASFiClearExportC6db193cb4165a71b1582465812478"; | 51 | + String secretKey = "IDEiClearExport89b358b0cc07788c1654745105866"; |
| 52 | String token = getSHA256String(secretKey); | 52 | String token = getSHA256String(secretKey); |
| 53 | System.out.println(token); | 53 | System.out.println(token); |
| 54 | } | 54 | } | ... | ... |
-
Please register or login to post a comment