修改角色查询用户的方法

user_center/src/main/java/com/huaxu/service/impl/RoleServiceImpl.java

@@ -219,6 +219,8 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     public IPage<UserEntity> findUsersByRole(Role role, IPage<UserEntity> iPage) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        role.setTenantId(currentUser.getTenantId());
         return  roleMapper.findUsersByRole(iPage,role);
     }
 

user_center/src/main/resources/application-dev.properties

@@ -82,6 +82,3 @@ receive.exchange.name=messageExchange
 dispath.routing.key=dipathKey
 
 
-receive.exchange.name=messageExchange
-dispath.routing.key=dipathKey
-

user_center/src/main/resources/application-sit.properties

@@ -67,6 +67,18 @@ spring.kafka.consumer.properties.spring.json.trusted.packages=*
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/
 UMIS.sys_excel_path=/UMIS_USER_EXCEL/
+#rabbit
+spring.rabbitmq.addresses=114.135.61.188:55672
+spring.rabbitmq.username=zoniot
+spring.rabbitmq.password=zcxk100
+spring.rabbitmq.virtual-host=/
+spring.rabbitmq.connection-timeout=15000
+spring.rabbitmq.publisher-confirm-type=correlated
+spring.rabbitmq.publisher-returns=true
+spring.rabbitmq.template.mandatory=true
+dispath.queue=dispath
+receive.exchange.name=messageExchange
+dispath.routing.key=dipathKey
 
 
 

user_center/src/main/resources/mapper/RoleMapper.xml

@@ -284,9 +284,9 @@
      </sql>
     <select id="findUsersByRole" resultType="com.huaxu.entity.UserEntity">
         select 	<include refid="userColumns"/>
-         from uims_user_role b join uims_user a on b.USER_ID=a.ID
+         from  uims_user a
         <include refid="sysAreaJoins"/>
-        where b.ROLE_ID=#{role.id} and b.status!=0 and userrole.status!=0
+        where a.tenant_id=#{role.tenantId} and userrole.status=1 and a.status=1
     </select>
     <update id="deleteRoleUser">
         update uims_user_role set status=0 where ROLE_ID=#{id}