diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java index f306c8b46..a3d3daba5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java @@ -6,6 +6,8 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.worker.entity.WorkerCertificate; import com.zhgd.xmgl.modules.worker.service.IWorkerCertificateService; import com.zhgd.xmgl.util.DateUtils; @@ -44,6 +46,9 @@ public class WorkerCertificateController { @Autowired private IWorkerCertificateService workerCertificateService; + @Autowired + private ISystemUserService systemUserService; + /** * 分页列表查询 * @@ -163,6 +168,10 @@ public class WorkerCertificateController { public Result> queryByType(@RequestBody Map map) { Result> result = new Result>(); String workerId = MapUtils.getString(map, "workerId"); + if (StringUtils.isBlank(workerId)) { + String userId = MapUtils.getString(map, "userId"); + workerId = systemUserService.getById(userId).getWorkerId().toString(); + } Integer certificateType = MapUtils.getInteger(map, "certificateType"); List workerCertificate = workerCertificateService.list(Wrappers.lambdaQuery() .eq(WorkerCertificate::getWorkerId, workerId)