From 88cc9e3edcb14f778a4ce404415f127656ab95bb Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 24 八月 2023 18:41:24 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java | 2 +-
server/src/main/resources/mappers/PlansExtMapper.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
index e289aa1..d406e58 100644
--- a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
@@ -226,7 +226,7 @@
@Override
public void wxLoginOut(WxLoginOutDTO wxLoginOutDTO) {
- if(Objects.isNull(wxLoginOutDTO)&&!Objects.isNull(wxLoginOutDTO.getCompanyUserId())){
+ if(!Objects.isNull(wxLoginOutDTO)&&!Objects.isNull(wxLoginOutDTO.getCompanyUserId())){
companyUserExtMapper.update(null,new UpdateWrapper<CompanyUser>()
.set("UNIONID","").set("OPENID","")
.eq("id",wxLoginOutDTO.getCompanyUserId())
diff --git a/server/src/main/resources/mappers/PlansExtMapper.xml b/server/src/main/resources/mappers/PlansExtMapper.xml
index 633bb9c..ee7c019 100644
--- a/server/src/main/resources/mappers/PlansExtMapper.xml
+++ b/server/src/main/resources/mappers/PlansExtMapper.xml
@@ -1254,12 +1254,12 @@
<if test="usermodelInvalidTime != null">
AND `usermodel`.`INVALID_TIME` = #{usermodelInvalidTime}
</if>
- <if test="startDate != null">
+ <!--<if test="startDate != null">
AND `a`.`PLAN_DATE` >= #{startDate}
</if>
<if test="endDate != null">
AND #{endDate} >= `a`.`PLAN_DATE`
- </if>
+ </if>-->
<if test="mixParam != null and mixParam!=''">
AND (mmodel.name like concat('%',#{mixParam},'%') or mmodel.code like concat('%',#{mixParam},'%') or pmodel.name like concat('%',#{mixParam},'%'))
</if>
--
Gitblit v1.9.3