From 5944c9ea054165cc4adfa79254f9b724abc371db Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 03 九月 2024 13:52:00 +0800
Subject: [PATCH] 执法记录条件
---
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 2 +-
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 3 +++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 4 +---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index 650dbef..dfec893 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -76,6 +76,9 @@
@GetMapping("/commonList")
public TableDataInfo commonList(EnforceOrderQueryBo bo)
{
+ if (bo.getCheckDeptId()==null){
+ bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(SecurityUtils.getDeptId()));
+ }
startPage();
List<EnforceOrderVo> list = iEnforceOrderService.queryCommonList(bo);
return getDataTable(list);
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
index 343266d..1f0fa9c 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
@@ -74,8 +74,8 @@
}
addCheckLog(company, bo);
company.setCheckReason(bo.getCheckReason());
- companyService.updStatus(companyBo);
companyService.updateById(company);
+ companyService.updStatus(companyBo);
}
return true;
case 2:
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 7797ee3..db16813 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -67,9 +67,7 @@
public List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- if (bo.getCheckDeptId()!=null){
- bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(SecurityUtils.getDeptId()));
- }
+
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
--
Gitblit v1.9.1