Merge remote-tracking branch 'origin/main'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -156,7 +156,7 @@ public class SysUserController extends BaseController
     /**
      * 批量生成投票用户
      */
-    //@PreAuthorize("@ss.hasPermi('system:user:add')")
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/adds")
     @Transactional

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -65,8 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id,u.pc_ids,u.pc_names,u.vote_ids, u.item_ids, u.item_names,u.uid, u.sex, u.email, u.avatar, u.phonenumber, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id,u.pc_ids,u.pc_names,u.vote_ids, u.item_ids, u.item_names,u.uid, u.sex, u.email, u.avatar, u.phonenumber, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+		,ur.role_id  from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
+		join sys_user_role ur on u.user_id = ur.user_id    <!--改行后添加  为使用角色查询用户-->
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
@@ -75,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="pcId != null "> AND u.pc_id = #{pcId}</if>
-		<!--<if test="pcIds != null "> AND u.pc_ids = #{pcIds}</if>-->
+		<if test="roleId != null "> AND ur.role_id = #{roleId}</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>
@@ -106,8 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 	</select>
 
-
-	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.pc_id,u.pc_ids,u.pc_names,u.vote_ids,u.item_ids, u.item_names,u.uid, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u

ruoyi-ui/vue.config.js

@@ -10,6 +10,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
 
 const baseUrl = 'http://localhost:8989' // 后端接口
+//const baseUrl = 'http://172.16.9.9:8989' // 后端接口
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口