Merge branch 'hotfix-20231206-bugs'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -30,6 +30,7 @@ import com.qunzhixinxi.hnqz.admin.entity.dto.CommonUserDTO;
 import com.qunzhixinxi.hnqz.admin.entity.input.UserCertificationInput;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.CommonUserExcelModel;
 import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
@@ -921,11 +922,11 @@ public class SysUserController {
 				}
 			}
 
-			SysUser query = new SysUser();
-			query.setUsername(userDto.getUsername());
-			query.setDeptId(userDto.getDeptId());
-			SysUser sysUser = sysUserMapper.selectUserByName(query);
-			if (sysUser != null) {
+			Integer count = sysUserMapper.selectCount(Wrappers.<SysUser>lambdaQuery()
+					.eq(SysUser::getUsername, userDto.getUsername())
+					.eq(SysUser::getDeptId, userDto.getDeptId())
+					.eq(SysUser::getDelFlag, DelEnum.NOT_DEL.val()));
+			if (count > 0) {
 				if (userDto.getRole().contains(6) && userDto.getRole().contains(4)) {
 					return R.failed("用户不能同时为经销商管理员角色和兼职学术推广员角色");
 				}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -1110,8 +1110,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		if (SecurityUtils.getRoles().contains(1) || SecurityUtils.getRoles().contains(2)) {
 			return baseMapper.getUserVosPage(page, userDTO, new DataScope());
 		} else if (SecurityUtils.getRoles().contains(19)) {
-			// CMS用户没有查询权限
-			return new Page();
+			return baseMapper.getUserVosPage(page, userDTO, new DataScope());
 		}
 		Integer deptId = userDTO.getDeptId();
 //		if (null != userDTO.getDeptId()) {