From 0e2d23c4ff1f12413ac9fe34632ef3d72e7e7d9e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 13:48:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 3 ++-
flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java | 7 +++++++
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java | 5 +++++
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 10 ++++------
flower_city/src/main/java/com/dg/core/controller/UserController.java | 3 +--
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index 7efd705..c8229b2 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -84,15 +84,13 @@
*/
@ApiOperation("删除机构")
@DeleteMapping("/delete")
- @Authorization
+// @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
Assert.notNull(Id, "Id 不能为空");
- OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
+ List<OrganizationChartEntity> list=iOrganizationChartService.selectParentList(Id,"");
- List<OrganizationChartEntity> list=iOrganizationChartService.selectConfigList(entity.getId()+"","");
-
- if(list.size()>0)
+ if(list!=null && list.size()>0)
{
return ResultData.error("该机构下存在其他部门！请先删除子部门");
}
@@ -144,7 +142,7 @@
public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
{
List<OrganizationChartEntity> ids=new ArrayList<>();
- List<OrganizationChartEntity> lists = iOrganizationChartService.selectConfigList(departmentId,"");
+ List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
if(lists.size()<1)
{
lists.add(iOrganizationChartService.selectConfigById(departmentId));
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 60a14c6..8e80ef0 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -50,7 +50,7 @@
SysUser user=null;
//管理员登录
- if(!StringUtils.isEmpty(account))
+ if(StringUtils.equals("zigonggaoadmin",account))
{
user= IUserService.getUserByAccount(account);
@@ -109,7 +109,6 @@
}
String token = tokenManager.getTokenByUserId(user.getUserId());
-// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
System.out.println("token "+token);
if (token == null) {
//生成一个token，保存用户登录状态
diff --git a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
index 873f6e2..269b9f5 100644
--- a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
+++ b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
@@ -41,6 +41,7 @@
//从数据库中查询并返回
return userService.selectData(currentUserId+"");
}
- throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
+ return null;
+// throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
}
}
diff --git a/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java b/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
index f0e143c..6bf74b7 100644
--- a/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
@@ -62,5 +62,12 @@
List<String> getIds(String id);
+ /**
+ * 根据id 查询是否有子部门
+ * @param parentId
+ * @param grade
+ * @return
+ */
+ public List<OrganizationChartEntity> selectParentList(String parentId,String grade);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
index 38ab575..0d27f26 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
@@ -113,6 +113,11 @@
return ids;
}
+ @Override
+ public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
+ return baseMapper.selectConfigList(parentId,grade);
+ }
+
//递归取id
private List<String> disposestreetId(List<OrganizationChartEntity> lists)
{
--
Gitblit v1.7.1