|
@@ -29,10 +29,6 @@ import com.customs.cq.datacenter.business.service.CheckRecordService;
|
|
import com.customs.cq.datacenter.common.ExecutedResult;
|
|
import com.customs.cq.datacenter.common.ExecutedResult;
|
|
import com.customs.cq.datacenter.common.PagerResult;
|
|
import com.customs.cq.datacenter.common.PagerResult;
|
|
import com.customs.cq.datacenter.common.core.controller.BasicController;
|
|
import com.customs.cq.datacenter.common.core.controller.BasicController;
|
|
-import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
|
|
|
|
-import com.customs.cq.datacenter.common.enums.EResultCode;
|
|
|
|
-import com.customs.cq.datacenter.common.exception.ServiceException;
|
|
|
|
-import com.customs.cq.datacenter.common.helper.LoginHelper;
|
|
|
|
import com.customs.cq.datacenter.common.model.ReqListId;
|
|
import com.customs.cq.datacenter.common.model.ReqListId;
|
|
import com.customs.cq.datacenter.common.validator.ParameterValidateResult;
|
|
import com.customs.cq.datacenter.common.validator.ParameterValidateResult;
|
|
import com.customs.cq.datacenter.common.validator.ParameterValidator;
|
|
import com.customs.cq.datacenter.common.validator.ParameterValidator;
|
|
@@ -40,7 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
-import java.util.Objects;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 2010.隐患检查记录
|
|
* 2010.隐患检查记录
|
|
@@ -102,7 +97,7 @@ public class CheckRecordController extends BasicController {
|
|
*/
|
|
*/
|
|
@PostMapping(value = "search")
|
|
@PostMapping(value = "search")
|
|
public ExecutedResult<PagerResult<CheckRecordVO>> search(@RequestBody SearchCheckRecord request) {
|
|
public ExecutedResult<PagerResult<CheckRecordVO>> search(@RequestBody SearchCheckRecord request) {
|
|
- return this.service.search(request, Boolean.FALSE);
|
|
|
|
|
|
+ return this.service.search(request, null);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -111,12 +106,6 @@ public class CheckRecordController extends BasicController {
|
|
*/
|
|
*/
|
|
@PostMapping(value = "listMine")
|
|
@PostMapping(value = "listMine")
|
|
public ExecutedResult<PagerResult<CheckRecordVO>> listMine(@RequestBody SearchCheckRecord request) {
|
|
public ExecutedResult<PagerResult<CheckRecordVO>> listMine(@RequestBody SearchCheckRecord request) {
|
|
- LoginUser loginUser = LoginHelper.getLoginUser();
|
|
|
|
- if (Objects.isNull(loginUser)) {
|
|
|
|
- throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
|
|
|
|
- }
|
|
|
|
- // 指定用户查询
|
|
|
|
- request.setCheckPerson(loginUser.getUserId().toString());
|
|
|
|
return this.service.search(request, Boolean.FALSE);
|
|
return this.service.search(request, Boolean.FALSE);
|
|
}
|
|
}
|
|
|
|
|