用户下拉列表——按角色查询

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -31,6 +33,7 @@ import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.service.*;
 import org.jeecg.modules.system.vo.SysDepartUsersVO;
 import org.jeecg.modules.system.vo.SysUserRoleVO;
+import org.jeecg.modules.system.vo.SysUserXLListVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -57,6 +60,7 @@ import java.util.stream.Collectors;
  * @Author scott
  * @since 2018-12-20
  */
+@Api(tags = ".用户管理")
 @Slf4j
 @RestController
 @RequestMapping("/sys/user")
@@ -93,6 +97,18 @@ public class SysUserController {
     private BaseCommonService baseCommonService;
 
     /**
+     * 用户下拉列表——按角色查询
+     * */
+    @ApiOperation(value="用户下拉列表——按角色查询", notes="用户下拉列表——按角色查询")
+    @GetMapping("/xialalist")
+    public List<SysUserXLListVO> list1(@RequestParam("position") String position)
+    {
+        List<SysUserXLListVO> list = sysUserService.getUserVOListByRoleName(position);
+        return list;
+    }
+
+
+    /**
      * 获取用户列表数据
      * @param user
      * @param pageNo
@@ -106,7 +122,7 @@ public class SysUserController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
 		QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-        
+
         //update-begin-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id
         //部门ID
         String departId = req.getParameter("departId");
@@ -895,7 +911,7 @@ public class SysUserController {
         }
         return result;
     }
-    
+
     /**
          *  查询当前用户的所有部门/当前部门编码
      * @return
@@ -918,12 +934,12 @@ public class SysUserController {
         return result;
     }
 
-    
+
 
 
 	/**
 	 * 用户注册接口
-	 * 
+	 *
 	 * @param jsonObject
 	 * @param user
 	 * @return
@@ -1070,7 +1086,7 @@ public class SysUserController {
 		result.setSuccess(true);
 		return result;
 	}
-	
+
 	/**
 	 * 用户更改密码
 	 */
@@ -1120,11 +1136,11 @@ public class SysUserController {
             return result;
         }
     }
-	
+
 
 	/**
 	 * 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
-	 * 
+	 *
 	 * @return
 	 */
 	@GetMapping("/getUserSectionInfoByToken")
@@ -1135,7 +1151,7 @@ public class SysUserController {
 			if (oConvertUtils.isEmpty(token)) {
 				 username = JwtUtil.getUserNameByToken(request);
 			} else {
-				 username = JwtUtil.getUsername(token);				
+				 username = JwtUtil.getUsername(token);
 			}
 
 			log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
@@ -1156,7 +1172,7 @@ public class SysUserController {
 			return Result.error(500, "查询失败:" + e.getMessage());
 		}
 	}
-	
+
 	/**
 	 * 【APP端接口】获取用户列表  根据用户名和真实名 模糊匹配
 	 * @param keyword
@@ -1193,7 +1209,7 @@ public class SysUserController {
 			log.error(e.getMessage(), e);
 			return Result.error(500, "查询失败:" + e.getMessage());
 		}
-		
+
 	}
 
     /**

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.vo.SysUserDepVo;
+import org.jeecg.modules.system.vo.SysUserXLListVO;
 
 import java.util.List;
 
@@ -23,6 +24,13 @@ import java.util.List;
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
 	/**
+	 * 通过角色名称查询用户VO集合
+	 * @param position
+	 * @return
+	 */
+	List<SysUserXLListVO> getUserVOListByRoleName(String position);
+
+	/**
 	 * 通过角色名称查询用户真实姓名集合
 	 * @param roleName
 	 * @return

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -2,13 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.system.mapper.SysUserMapper">
 
+	<!-- 通过角色名称查询用户VO集合 -->
+	<select id="getUserVOListByRoleName" resultType="org.jeecg.modules.system.vo.SysUserXLListVO">
+		SELECT u.id, u.realname as name
+		FROM sys_user u
+				 JOIN sys_user_role ur ON u.id = ur.user_id
+				 JOIN sys_role r ON r.id = ur.role_id
+		WHERE r.role_name = #{position} and del_flag=0;
+	</select>
+
 	<!-- 通过角色名称查询用户真实姓名集合 -->
 	<select id="getUserNameByRoleName" resultType="java.lang.String">
 		SELECT u.realname
 		FROM sys_user u
 				 JOIN sys_user_role ur ON u.id = ur.user_id
 				 JOIN sys_role r ON ur.role_id = r.id
-		WHERE r.role_name = #{roleName};
+		WHERE r.role_name = #{roleName} and del_flag=0;
 	</select>
 
 	<!-- 根据用户名查询 -->

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -11,6 +11,7 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.modules.system.entity.SysRoleIndex;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
+import org.jeecg.modules.system.vo.SysUserXLListVO;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
@@ -29,6 +30,13 @@ import java.util.Set;
 public interface ISysUserService extends IService<SysUser> {
 
 	/**
+	 * 通过角色名称查询用户VO集合
+	 * @param position
+	 * @return
+	 */
+	List<SysUserXLListVO> getUserVOListByRoleName(String position);
+
+	/**
 	 * 重置密码
 	 *
 	 * @param username
@@ -67,15 +75,15 @@ public interface ISysUserService extends IService<SysUser> {
      * @return SysUser
      */
 	public SysUser getUserByName(String username);
-	
+
 	/**
 	 * 添加用户和用户角色关系
 	 * @param user
 	 * @param roles
 	 */
 	public void addUserWithRole(SysUser user,String roles);
-	
-	
+
+
 	/**
 	 * 修改用户和用户角色关系
 	 * @param user
@@ -98,7 +106,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	public SysRoleIndex getDynamicIndexByUserRole(String username,String version);
-	
+
 	/**
 	  * 查询用户信息包括 部门信息
 	 * @param username
@@ -178,14 +186,14 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return 权限集合
 	 */
 	Set<String> getUserPermissionsSet(String username);
-	
+
 	/**
 	 * 根据用户名设置部门ID
 	 * @param username
 	 * @param orgCode
 	 */
 	void updateUserDepart(String username,String orgCode);
-	
+
 	/**
 	 * 根据手机号获取用户名和密码
      * @param phone 手机号
@@ -215,7 +223,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param departs
 	 */
 	void editUserWithDepart(SysUser user, String departs);
-	
+
 	/**
 	   * 校验用户是否有效
 	 * @param sysUser

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -23,6 +23,7 @@ import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.vo.SysUserDepVo;
+import org.jeecg.modules.system.vo.SysUserXLListVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
@@ -73,7 +74,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	@Autowired
 	SysRoleIndexMapper sysRoleIndexMapper;
 	@Autowired
-	ItdmPersonManageTaskMapper personManageMapper;
+	private SysUserMapper sysUserMapper;
+//	@Autowired
+//	ItdmPersonManageTaskMapper personManageMapper;
+
+	/**
+	 * 通过角色名称查询用户VO集合
+	 * @param position
+	 * @return
+	 */
+	public List<SysUserXLListVO> getUserVOListByRoleName(String position){
+		return sysUserMapper.getUserVOListByRoleName(position);
+	}
 
     @Override
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -518,18 +530,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) {
-		String role = null;//
+//		String role = null;//
+
+		//用户名称唯一限制
+
 
 		//step.1 保存用户
 		this.save(user);
-		SysUser u = user;
+//		SysUser u = user;
 		//step.2 保存角色
 		if(oConvertUtils.isNotEmpty(selectedRoles)) {
 			String[] arr = selectedRoles.split(",");
 			for (String roleId : arr) {
 				SysUserRole userRole = new SysUserRole(user.getId(), roleId);
 				sysUserRoleMapper.insert(userRole);
-				role = sysRoleMapper.selectById(roleId).getRoleName();//
+//				role = sysRoleMapper.selectById(roleId).getRoleName();//
 			}
 		}
 		//step.3 保存所属部门
@@ -540,17 +555,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				sysUserDepartMapper.insert(userDeaprt);
 			}
 		}
-		//新增用户管理
-		Date date = new Date();
-		DefaultIdentifierGenerator digester = new DefaultIdentifierGenerator();
-		personManageMapper.insertIntoPersonManage(String.valueOf(digester.nextId(null)),user.getRealname(),user.getSex(),user.getPhone(),role,user.getId(),date);
+//		//新增用户管理
+//		Date date = new Date();
+//		DefaultIdentifierGenerator digester = new DefaultIdentifierGenerator();
+//		personManageMapper.insertIntoPersonManage(String.valueOf(digester.nextId(null)),user.getRealname(),user.getSex(),user.getPhone(),role,user.getId(),date);
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true)
 	public void editUser(SysUser user, String roles, String departs) {
-		String role = null;
+//		String role = null;
 		//step.1 修改用户基础信息
 		this.updateById(user);
 		//step.2 修改角色
@@ -561,7 +576,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			for (String roleId : arr) {
 				SysUserRole userRole = new SysUserRole(user.getId(), roleId);
 				sysUserRoleMapper.insert(userRole);
-				role = sysRoleMapper.selectById(roleId).getRoleName(); //
+//				role = sysRoleMapper.selectById(roleId).getRoleName(); //
 			}
 		}
 
@@ -598,9 +613,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		// 更新手机号、邮箱空字符串为 null
 		userMapper.updateNullByEmptyString("email");
 		userMapper.updateNullByEmptyString("phone");
-		//修改对应的用户管理
-		Date date = new Date();
-		personManageMapper.updatePersonManage(user.getRealname(),user.getSex(),user.getPhone(),role,user.getId(),date);
+//		//修改对应的用户管理
+//		Date date = new Date();
+//		personManageMapper.updatePersonManage(user.getRealname(),user.getSex(),user.getPhone(),role,user.getId(),date);
 
 	}