From 985a45dc5017872196ee9c3ae0af3094c223bb0e Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 11:26:55 +0800
Subject: [PATCH] 代码整理
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index cfb4b42..3052027 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -27,6 +27,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.consum.base.BaseController;
+import com.consum.base.core.type.StatesType;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.PageUtil;
@@ -496,7 +497,7 @@
finSysTenantUser.setStatus(user.getStatus());
finSysTenantUserService.update(finSysTenantUser);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
- S_user_core userCore = buildUpdateUserCore(tenantUser);
+ S_user_core userCore = buildUpdateUserCore(finSysTenantUser);
this.userService.update(userCore);
return ResponseValue.success(1);
}
@@ -818,6 +819,8 @@
// 閮ㄩ棬
FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment();
finSysTenantDepartment.setTenantId(agencyId);
+ finSysTenantDepartment.setStatus(StatesType.NORMAL.getValue());
+ finSysTenantDepartment.setIsDelete(0);
List<FinSysTenantDepartment> tenantDepartmentList =
finSysTenantDepartmentService.select(finSysTenantDepartment);
List<DepartmentVO> departmentVOList = Lists.newArrayList();
@@ -829,8 +832,8 @@
departmentVO.setName(department.getName());
departmentVO.setType("department");
- String sql = "SELECT SYS_USER_ID,USER_NAME FROM " + "fin_sys_tenant_user "
- + "WHERE SYS_DEPT_ID =:deptId AND SYS_USER_ID NOT IN(SELECT MANAGER_ID FROM base_warehouse_manager)";
+ String sql = "SELECT SYS_USER_ID,USER_NAME FROM fin_sys_tenant_user "
+ + "WHERE STATUS =1 and SYS_DEPT_ID =:deptId AND SYS_USER_ID NOT IN(SELECT MANAGER_ID FROM base_warehouse_manager)";
Map<String, Object> param = new HashMap<>();
param.put("deptId", id);
List<Map<String, Object>> select = finSysTenantUserService.select(sql, param, new MapperUtil());
--
Gitblit v1.9.1