From b4b2b63345961884c8a9dd95ca1f32c0ea1123e5 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 20:31:27 +0800
Subject: [PATCH] 多机构
---
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 7 +++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 1
project-system/src/main/java/com/project/system/domain/vo/SysUserDeptTreeVo.java | 22 +++++++++++
project-system/src/main/java/com/project/system/service/impl/SysUserDeptServiceImpl.java | 38 +++++++++++++++++++
project-system/src/main/java/com/project/system/service/ISysUserDeptService.java | 8 ++++
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/ComplaintResultBo.java | 1
6 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
index 4379306..31b5c40 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
@@ -225,6 +225,13 @@
return AjaxResult.success(userDeptService.batchUserDeptSave(bo));
}
+ @ApiOperation("鐢ㄦ埛澶氭満鏋勨�斺�旀満鏋勬爲")
+ @GetMapping("/batchUserDeptTree")
+ public AjaxResult batchUserDeptTree(@RequestParam("deptId") Long deptId)
+ {
+ return AjaxResult.success(userDeptService.batchUserDeptTree(deptId));
+ }
+
@ApiOperation("浼佷笟鐢ㄦ埛閲嶇疆瀵嗙爜")
@Log(title = "浼佷笟鐢ㄦ埛閲嶇疆瀵嗙爜", businessType = BusinessType.UPDATE)
@PostMapping("/resetCompanyUserPwd")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/ComplaintResultBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/ComplaintResultBo.java
index f1b3290..6fc9cf6 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/ComplaintResultBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/ComplaintResultBo.java
@@ -13,5 +13,6 @@
public class ComplaintResultBo
{
private Long id;
+ private Integer complaintStatus;
private String result;
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
index 2ddc13e..8a81c0d 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
@@ -130,6 +130,7 @@
.set(EnforceComplaintLog::getResultId,loginUser.getUserId())
.set(EnforceComplaintLog::getResultUser,loginUser.getNickName())
.set(EnforceComplaintLog::getResultTime, DateUtils.getNowDate())
+ .set(EnforceComplaintLog::getComplaintStatus, bo.getComplaintStatus())
.set(EnforceComplaintLog::getComplaintResult, bo.getResult())
.eq(EnforceComplaintLog::getId, bo.getId())
);
diff --git a/project-system/src/main/java/com/project/system/domain/vo/SysUserDeptTreeVo.java b/project-system/src/main/java/com/project/system/domain/vo/SysUserDeptTreeVo.java
new file mode 100644
index 0000000..b60bbeb
--- /dev/null
+++ b/project-system/src/main/java/com/project/system/domain/vo/SysUserDeptTreeVo.java
@@ -0,0 +1,22 @@
+package com.project.system.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ */
+
+@Data
+public class SysUserDeptTreeVo
+{
+ private Long deptId;
+
+ private String deptName;
+
+ private List<SysUserDeptTreeVo> child;
+}
diff --git a/project-system/src/main/java/com/project/system/service/ISysUserDeptService.java b/project-system/src/main/java/com/project/system/service/ISysUserDeptService.java
index 8504b89..cdab68a 100644
--- a/project-system/src/main/java/com/project/system/service/ISysUserDeptService.java
+++ b/project-system/src/main/java/com/project/system/service/ISysUserDeptService.java
@@ -3,6 +3,7 @@
import com.project.common.mybatis.IBaseService;
import com.project.system.domain.SysUserDept;
import com.project.system.domain.bo.editBo.UserDeptBo;
+import com.project.system.domain.vo.SysUserDeptTreeVo;
import com.project.system.domain.vo.UserDeptVo;
/**
@@ -26,4 +27,11 @@
* @return 缁撴灉
*/
Boolean batchUserDeptSave(UserDeptBo bo);
+
+ /**
+ * 鐢ㄦ埛澶氭満鏋勬爲
+ * @param deptId 褰撳墠鏈烘瀯id
+ * @return 缁撴灉
+ */
+ SysUserDeptTreeVo batchUserDeptTree(Long deptId);
}
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysUserDeptServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysUserDeptServiceImpl.java
index 6a75b91..b5a97f8 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysUserDeptServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysUserDeptServiceImpl.java
@@ -1,12 +1,16 @@
package com.project.system.service.impl;
+import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.core.domain.entity.SysDept;
import com.project.common.exception.base.BaseException;
import com.project.common.utils.StringUtils;
import com.project.system.domain.SysUserDept;
import com.project.system.domain.bo.editBo.UserDeptBo;
+import com.project.system.domain.vo.SysUserDeptTreeVo;
import com.project.system.domain.vo.UserDeptVo;
import com.project.system.mapper.SysUserDeptMapper;
+import com.project.system.service.ISysDeptService;
import com.project.system.service.ISysUserDeptService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +29,8 @@
@Service
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class SysUserDeptServiceImpl extends ServiceImpl<SysUserDeptMapper, SysUserDept> implements ISysUserDeptService {
+
+ private final ISysDeptService deptService;
/**
@@ -63,4 +69,36 @@
}
return this.saveBatch(saveList);
}
+
+
+ /**
+ * 鐢ㄦ埛澶氭満鏋勬爲
+ * @param deptId 鍙傛暟
+ * @return 缁撴灉
+ */
+ @Override
+ public SysUserDeptTreeVo batchUserDeptTree(Long deptId)
+ {
+ Long checkDeptIdByLoginDeptId = deptService.getCheckDeptIdByLoginDeptId(deptId);
+ return getDeptTree(checkDeptIdByLoginDeptId);
+ }
+
+
+ /**
+ * 鑾峰彇瀹℃壒鍙婂叾涓嬬骇閮ㄩ棬
+ * @param deptId 瀹℃壒閮ㄩ棬id
+ * @return 鏈烘瀯鏍�
+ */
+ private SysUserDeptTreeVo getDeptTree(Long deptId)
+ {
+ SysUserDeptTreeVo vo = new SysUserDeptTreeVo();
+ SysDept sysDept = deptService.selectDeptById(deptId);
+ vo.setDeptId(sysDept.getDeptId());
+ vo.setDeptName(sysDept.getDeptName());
+
+ List<SysDept> list = deptService.list(deptService.lq().eq(SysDept::getParentId, deptId));
+ List<SysUserDeptTreeVo> child = Convert.toList(SysUserDeptTreeVo.class, list);
+ vo.setChild(child);
+ return vo;
+ }
}
--
Gitblit v1.9.1