修复:UserVerify模块
This commit is contained in:
@@ -1,22 +1,19 @@
|
||||
package com.gxwebsoft.common.system.controller;
|
||||
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.gxwebsoft.common.core.annotation.OperationLog;
|
||||
import com.gxwebsoft.common.core.web.ApiResult;
|
||||
import com.gxwebsoft.common.core.web.BaseController;
|
||||
import com.gxwebsoft.common.core.web.BatchParam;
|
||||
import com.gxwebsoft.common.core.web.PageResult;
|
||||
import com.gxwebsoft.common.system.entity.Organization;
|
||||
import com.gxwebsoft.common.system.entity.User;
|
||||
import com.gxwebsoft.common.system.entity.UserVerify;
|
||||
import com.gxwebsoft.common.system.param.UserVerifyParam;
|
||||
import com.gxwebsoft.common.system.service.OrganizationService;
|
||||
import com.gxwebsoft.common.system.service.UserService;
|
||||
import com.gxwebsoft.common.system.service.UserVerifyService;
|
||||
import com.gxwebsoft.common.system.entity.UserVerify;
|
||||
import com.gxwebsoft.common.system.param.UserVerifyParam;
|
||||
import com.gxwebsoft.common.core.web.ApiResult;
|
||||
import com.gxwebsoft.common.core.web.PageResult;
|
||||
import com.gxwebsoft.common.core.web.PageParam;
|
||||
import com.gxwebsoft.common.core.web.BatchParam;
|
||||
import com.gxwebsoft.common.core.annotation.OperationLog;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
@@ -80,7 +77,7 @@ public class UserVerifyController extends BaseController {
|
||||
}
|
||||
wrapper.last("limit 1");
|
||||
final UserVerify one = userVerifyService.getOne(wrapper);
|
||||
if(one.getOrganizationId() > 0){
|
||||
if(ObjUtil.isNotEmpty(one) && one.getOrganizationId() > 0){
|
||||
final Organization organization = organizationService.getById(one.getOrganizationId());
|
||||
one.setOrganizationName(organization.getOrganizationName());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user