24282 2 rokov pred
rodič
commit
77d7d16875

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -214,8 +214,6 @@ public interface ISysUserService extends IService<SysUser> {
      * @param userIdList 用户id list
      * @return 用户list
      */
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.SLAVE_NAME)
     List<SysUser> getListByUserId(List<Long> userIdList);
 
 }

+ 5 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -1,8 +1,10 @@
 package com.ruoyi.system.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.TenantIgnore;
+import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -21,6 +23,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -481,6 +484,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return successMsg.toString();
     }
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @DS(DatasourceConstant.SLAVE_NAME)
     @Override
     public List<SysUser> getListByUserId(List<Long> userIdList) {
         return listByIds(userIdList);