From a491941cece9a90d72c9c6b0aab0e718e39dbd3c Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 22 Aug 2022 15:54:22 +0800
Subject: [PATCH] 从业记录新增同步sql 修改,用户新增审查逻辑修改,外网部门只更新状态,不更新审查明细,内网状态和明细都更新
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 1753dd9..8dc6eb3 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -171,6 +171,19 @@
/**
+ * 懒加载获取单位树,电子围栏用
+ * @param type 1:本单位 2:分公司 3:服务单位
+ * @param deptId
+ * @return
+ */
+ @GetMapping("/lazy-tree-rail")
+ public R<List<DeptVO>> lazyTreeRail(Integer type,Long deptId) {
+ List<DeptVO> tree = deptService.lazyTreeRail(type,deptId);
+ return R.data(tree);
+ }
+
+
+ /**
* 懒加载获取部门树形结构(包含用户数据)app
* @param type 1:保安对保安 2:保安向民警 3:民警向民警
* @return
@@ -267,7 +280,7 @@
+ ",is_deleted = " + "'" + dept.getIsDeleted() + "'"
+ " " + "where id = " + "'" + dept.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
}
// String id = kv.get("id").toString();
// information.setDepartmentid(id);
@@ -299,7 +312,7 @@
//内网同步
String s1 = "update blade_dept set is_deleted = 1 where id = " + "'" + id + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
});
return R.status(deptService.removeDept(ids));
}
--
Gitblit v1.9.3