diff --git a/mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java b/mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java index a44a77d9d..a6e76396a 100644 --- a/mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java +++ b/mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java @@ -129,6 +129,7 @@ public class TokenService if (StringUtils.isNotEmpty(token)) { String userkey = JwtUtils.getUserKey(token); + redisService.deleteObject(userkey); redisService.deleteObject(getTokenKey(userkey)); } } diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/accountManage/AccountAssembler.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/accountManage/AccountAssembler.java index dfb8089bf..0fc4eb62b 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/accountManage/AccountAssembler.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/accountManage/AccountAssembler.java @@ -4,6 +4,7 @@ import com.linke.finance.domain.accountManage.entity.AccountExpendRecords; import com.linke.finance.interfaces.dto.*; import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; import java.util.Date; @@ -26,6 +27,7 @@ public class AccountAssembler { // 拷贝vehicleDto到vehicle中 BeanUtils.copyProperties(accountCashWalletDto, accountCashWallet); // 获取登录人id + LoginUser loginUser = SecurityUtils.getLoginUser(); Long userId = SecurityUtils.getLoginUser().getUserid(); if(accountCashWalletDto.getAccountCashWalletId() != null){ if(userId != null){ diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java index 21cd4481a..689785c04 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java @@ -17,9 +17,12 @@ import com.linke.finance.domain.approvalDocument.repository.po.ApprovalDocumentP import com.linke.finance.domain.approvalDocument.repository.todo.ApprovalDocumentDO; import com.linke.finance.interfaces.assemble.approvalDocument.ApprovalDocumentAssembler; import com.linke.finance.interfaces.dto.approvalDocument.ApprovalDocumentDTO; +import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.core.feign.ThirdPartyServiceFeign; import com.mhd.common.log.annotation.Log; import com.mhd.common.log.enums.BusinessType; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -55,6 +58,12 @@ public class ApprovalDocumentApi extends BaseController{ @GetMapping("/list") public TableDataInfo list(ApprovalDocumentDTO approvalDocumentDTO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + UserPo userPo = loginUser.getUserPo(); + String roleCode = userPo.getRoleCode(); + if (!"plat_admin".equals(roleCode)) { + return null; + } //转换实体 ApprovalDocumentDO approvalDocumentDO = approvalDocumentAssembler.toDO(approvalDocumentDTO); startPage(); diff --git a/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml b/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml index 0705d57de..c62228468 100644 --- a/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml +++ b/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into receiving_account (account_name, account_information, del_flag, create_time, update_time) + insert into receiving_account (account_name, account_information, del_flag, create_time, update_time,top_organization_id, organization_id) values ( @@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.accountInformation}, #{item.delFlag}, #{item.createTime}, - #{item.updateTime} + #{item.updateTime},#{item.topOrganizationId},#{item.organizationId} )