1.5.8-hgw-权限-角色-账号

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysRoleInfoServiceImpl.java

@@ -157,9 +157,13 @@ public class SysRoleInfoServiceImpl extends ServiceImpl<SysRoleInfoMapper, SysRo
 
 	private LambdaQueryWrapper buildQueryWrapper(SysRoleInfoSearchVo entity) {
 		LambdaQueryWrapper<SysRoleInfo> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(SysRoleInfo::getDeleteFlag, CommonConstants.ZERO_INT);
 		if (Common.isNotNull(entity.getRoleName())) {
 			wrapper.like(SysRoleInfo::getRoleName, entity.getRoleName());
 		}
+		if (Common.isNotNull(entity.getStatus())) {
+			wrapper.eq(SysRoleInfo::getStatus, entity.getStatus());
+		}
 		if (Common.isNotNull(entity.getCreateTimeStart())) {
 			wrapper.ge(SysRoleInfo::getCreateTime, entity.getCreateTimeStart());
 		}

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserInfoServiceImpl.java

@@ -83,6 +83,21 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
 
 	private LambdaQueryWrapper buildQueryWrapper(SysUserInfoSearchVo entity) {
 		LambdaQueryWrapper<SysUserInfo> wrapper = Wrappers.lambdaQuery();
+		if (Common.isNotNull(entity.getFdName())) {
+			wrapper.like(SysUserInfo::getFdName, entity.getFdName());
+		}
+		if (Common.isNotNull(entity.getFdLoginName())) {
+			wrapper.eq(SysUserInfo::getFdLoginName, entity.getFdLoginName());
+		}
+		if (Common.isNotNull(entity.getFdDeptName())) {
+			wrapper.like(SysUserInfo::getFdDeptName, entity.getFdDeptName());
+		}
+		if (Common.isNotNull(entity.getRoleNames())) {
+			wrapper.like(SysUserInfo::getRoleNames, entity.getRoleNames());
+		}
+		if (Common.isNotNull(entity.getStatus())) {
+			wrapper.eq(SysUserInfo::getStatus, entity.getStatus());
+		}
 		if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
 			wrapper.ge(SysUserInfo::getCreateTime, entity.getCreateTimes()[0])
 					.le(SysUserInfo::getCreateTime,