From cec8d658ce337a76ff36f8e387495021d6ad669f Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 20 Oct 2020 16:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/DepartmentsController.java    | 4 ++--
 .../com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java  | 2 +-
 .../lz/modules/flow/service/StaffRoleDepartmentService.java | 2 +-
 .../flow/service/impl/StaffRoleDepartmentServiceImpl.java   | 2 +-
 .../performance/controller/EvaluationGroupController.java   | 6 +++---
 .../resources/mapper/flow/StaffRoleDepartmentMapper.xml     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java
index 153521b8..38cfe697 100644
--- a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java
+++ b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java
@@ -43,10 +43,10 @@ public class DepartmentsController {
     //    @RequiresPermissions("staff:structure:list")
     @ApiOperation("获取全部有效部门树列表")
     @ApiResponses({@ApiResponse(code = 200, message = "成功", response = DepartmentsDto.class)})
-    public List<DepartmentsDto> deplist(@RequestParam @ApiParam(value = "请求类型0 请求部门不包含人员列表，1同时返回人员列表") int type) {
+    public R deplist(@RequestParam @ApiParam(value = "请求类型0 请求部门不包含人员列表，1同时返回人员列表") int type) {
         List<DepartmentsDto> departmentList = departmentsService.getDepartmentTree(type);
 
-        return departmentList;
+        return R.ok().put("data", departmentList);
     }
 
 
diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java
index 30158b1c..9467266c 100644
--- a/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java
@@ -44,5 +44,5 @@ public interface StaffRoleDepartmentMapper extends BaseMapper<StaffRoleDepartmen
 
     List<StaffRoleDepartment> selectStaffRoleDepartmentByStaffRoleIdDepartments(@Param("staffRoleId") Long staffRoleId, @Param("departments") List<String> departments);
 
-    List<DepartmentsSimpleDto> selectDepartmentSimpleInfos(@Param("ids") List<Long> ids);
+    List<DepartmentsSimpleDto> selectDepartmentSimpleInfos(@Param("ids") List<String> ids);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java
index 408e17ad..07e7f51a 100644
--- a/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java
+++ b/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java
@@ -41,5 +41,5 @@ public interface StaffRoleDepartmentService extends IService<StaffRoleDepartment
 
 	void deleteStaffRoleDepartment(Long id);
 
-    List<DepartmentsSimpleDto> selectDepartmentSimpleInfos(List<Long> ids);
+    List<DepartmentsSimpleDto> selectDepartmentSimpleInfos(List<String> ids);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java
index 73ed66bd..1925104e 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java
@@ -82,7 +82,7 @@ public class StaffRoleDepartmentServiceImpl extends ServiceImpl<StaffRoleDepartm
 	}
 
 	@Override
-	public List<DepartmentsSimpleDto> selectDepartmentSimpleInfos(List<Long> ids){
+	public List<DepartmentsSimpleDto> selectDepartmentSimpleInfos(List<String> ids){
 		return staffRoleDepartmentMapper.selectDepartmentSimpleInfos(ids);
 	}
 
diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
index 0f3f24e8..181f6965 100644
--- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
+++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
@@ -60,10 +60,10 @@ public class EvaluationGroupController {
         EvaluationGroupDto evaluationGroupDto = new EvaluationGroupDto();
         if(evaluationGroup.getDepIds() != null && evaluationGroup.getDepIds().length() > 0){
 
-            List<Long> ids = Arrays.stream(evaluationGroup.getDepIds().split(",")).map(new Function<String, Long>() {
+            List<String> ids = Arrays.stream(evaluationGroup.getDepIds().split(",")).map(new Function<String, String>() {
                 @Override
-                public Long apply(String s) {
-                    return Long.parseLong(s);
+                public String apply(String s) {
+                    return s;
                 }
             }).collect(Collectors.toList());
             List<DepartmentsSimpleDto> departmentsSimpleDtos = staffRoleDepartmentService.selectDepartmentSimpleInfos(ids);
diff --git a/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml b/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml
index 3ea7514c..88d725d8 100644
--- a/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml
+++ b/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml
@@ -114,7 +114,7 @@
     <select id="selectDepartmentSimpleInfos"
             resultType="com.lz.modules.app.dto.DepartmentsSimpleDto">
         select id, member_count, department_name from lz_departments  where is_delete = 0
-        and id in
+        and department_id in
         <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>