From 128447d263b3f5cac53cf10d0decc2b2172c5f0d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 11:56:21 +0800
Subject: [PATCH] 代码同步

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 223f3dc..49b48de 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -110,6 +110,8 @@
 	@ApiOperation(value = "新增", notes = "传入information")
 	public R save(@Valid @RequestBody Information information) {
 		Dept dept= new Dept();
+		String departmentid = information.getDepartmentid();
+		Long l=Long.parseLong(departmentid);
 		//自招保安公司
 		if(information.getStats().equals("0")){
 			Long i = 1420222768149966850L;
@@ -127,6 +129,7 @@
 			dept.setDeptName(information.getEnterprisename());
 			dept.setAncestors("0,1418458374477549569");
 			dept.setDeptCategory(1);
+
 		}
 		//保安服务公司
 		if(information.getStats().equals("2")){
@@ -146,6 +149,7 @@
 			dept.setAncestors("0,1420222961377357825");
 			dept.setDeptCategory(1);
 		}
+		dept.setId(l);
 		if (iDeptService.submit(dept)) {
 			CacheUtil.clear(SYS_CACHE);
 			// 返回懒加载树更新节点所需字段
@@ -369,7 +373,7 @@
 	}
 
 	/**
-	 * 查询本年所有月份社保金额
+	 * 查询本年所有月份社保金额(公司经济运营趋势)
 	 * @return
 	 */
 	@GetMapping("/queryYearAn")
@@ -723,4 +727,13 @@
 		return R.data(maps);
 	}
 
+	/**
+	 * 单位删除
+	 */
+	@PostMapping("/deleteDept")
+	public R deleteDept(String ids) {
+		informationService.deleteDept(ids);
+		return R.success("删除成功");
+	}
+
 }

--
Gitblit v1.9.3