diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/config/MyBatisPlusConfig.java b/linkwe-framework/src/main/java/com/linkwechat/framework/config/MyBatisPlusConfig.java
index 5fce6193593815c3bf9c51b2ccc2db38486a920a..9854dbcb598741911c7a6270b2690b64a2739718 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/config/MyBatisPlusConfig.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/config/MyBatisPlusConfig.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import com.github.pagehelper.PageInterceptor;
import com.linkwechat.common.config.WeComeConfig;
+import com.linkwechat.common.core.domain.entity.WeCorpAccount;
import com.linkwechat.common.utils.SecurityUtils;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.StringValue;
@@ -48,7 +49,13 @@ public class MyBatisPlusConfig
@Override
public Expression getTenantId() {
- return new StringValue(SecurityUtils.getLoginUser().getUser().getWeCorpAccount().getCorpId());
+ WeCorpAccount weCorpAccount
+ = SecurityUtils.getLoginUser().getUser().getWeCorpAccount();
+ if(null != weCorpAccount){
+ return new StringValue(weCorpAccount.getCorpId());
+ }
+
+ return null;
}
// 这是 default 方法,默认返回 false 表示所有表都需要拼多租户条件,
// 这里设置 role表不需要该条件
diff --git a/linkwe-system/src/main/resources/mapper/system/SysUserMapper.xml b/linkwe-system/src/main/resources/mapper/system/SysUserMapper.xml
index 2ee08e38988ab22b8f964e79dbb96fdfd63e120b..5c67f69262cdd0dcf00900e7f5b0a29a9f9285a6 100644
--- a/linkwe-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/linkwe-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+ d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,u.user_type,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAccessTokenServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAccessTokenServiceImpl.java
index 086e06fe55a5c2432c70ae63a0157c46bbaf5114..ac1c3ce84ccc1f37537ad34f0ac8065f2bb47cc9 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAccessTokenServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAccessTokenServiceImpl.java
@@ -136,8 +136,6 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
private String findAccessToken(String accessTokenKey){
- // WeCorpAccount wxCorpAccount
-// = iWxCorpAccountService.findValidWeCorpAccount();
WeCorpAccount wxCorpAccount
@@ -149,7 +147,7 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
}
- String weAccessToken =redisCache.getCacheObject(accessTokenKey+"::"+wxCorpAccount.getAgentId());
+ String weAccessToken =redisCache.getCacheObject(accessTokenKey+"::"+wxCorpAccount.getCorpId());
@@ -180,7 +178,7 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
}
if(StringUtils.isNotEmpty(token)){
- redisCache.setCacheObject(accessTokenKey+"::"+wxCorpAccount.getAgentId(),token,expires_in.intValue(), TimeUnit.SECONDS);
+ redisCache.setCacheObject(accessTokenKey+"::"+wxCorpAccount.getCorpId(),token,expires_in.intValue(), TimeUnit.SECONDS);
weAccessToken = token;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeDepartmentServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeDepartmentServiceImpl.java
index 1312521def46e95f5e1e3c195a45e454ddb93781..54a64581bc14f8cce0907dc59112ad403499b77d 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeDepartmentServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeDepartmentServiceImpl.java
@@ -63,19 +63,19 @@ public class WeDepartmentServiceImpl extends ServiceImplitem.getId().equals(WeConstans.WE_ROOT_DEPARMENT_ID)).findFirst().get()
- )
- );
-
- }
- }
+// WeDepartment weDepartment=this.baseMapper.selectWeDepartmentById(WeConstans.WE_ROOT_DEPARMENT_ID);
+// if(null == weDepartment){
+// WeDepartMentDto weDepartMentDto=weDepartMentClient.weDepartMents(WeConstans.WE_ROOT_DEPARMENT_ID);
+// if(WeConstans.WE_SUCCESS_CODE.equals(weDepartMentDto.getErrcode())
+// && CollectionUtils.isNotEmpty(weDepartMentDto.getDepartment())){
+// this.baseMapper.insertWeDepartment(
+// WeDepartment.transformWeDepartment(
+// weDepartMentDto.getDepartment().stream().filter(item->item.getId().equals(WeConstans.WE_ROOT_DEPARMENT_ID)).findFirst().get()
+// )
+// );
+//
+// }
+// }
return this.baseMapper.selectWeDepartmentList();
}
diff --git a/pom.xml b/pom.xml
index 8454df901cbc3e3c88e905e30273bea780ada61a..227853d763c46e5a4645e0a45214ac17e08c8231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,12 @@
com.github.pagehelper
pagehelper-spring-boot-starter
${pagehelper.boot.version}
+
+
+ com.github.jsqlparser
+ jsqlparser
+
+