From 1683ad2ef66bd539fa6f23d56f03a033020fe15b Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 18 二月 2025 11:35:08 +0800 Subject: [PATCH] 小程序登录 --- ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml | 1 + ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java index 01a18d4..aa07324 100644 --- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java +++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TContractController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.constant.DictConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.model.LoginUserApplet; import com.ruoyi.common.utils.DictUtils; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.SignContractDTO; @@ -58,6 +59,11 @@ @PostMapping(value = "/contractList") public R<PageInfo<TContract>> contractList(@RequestBody TContractAppletQuery query) { // todo 获取登陆人id + LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet(); + if (loginUserApplet==null){ + return R.fail(401,"登录失效"); + } + query.setTenantId(loginUserApplet.getUserId()); return R.ok(contractService.contractAppletList(query)); } @ApiOperation(value = "查询合同信息信息") diff --git a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml index eb9f2e8..05b10d4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml @@ -73,6 +73,7 @@ <if test="query.tenantId != null"> and t1.tenant_id = #{query.tenantId} </if> + and (t1.status=3 or t1.status=4) AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> </select> -- Gitblit v1.7.1