From 57d5a519afba388daf2155fd0e22d7b937a45067 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 18 May 2021 10:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E4=BA=BA=E5=91=98=E8=A1=A8=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=85=B3=E7=B3=BB=E8=A1=A8=EF=BC=8C=E5=B0=B1=E4=B8=9A?= =?UTF-8?q?=E8=A1=A8=E9=87=8C=E9=9D=A2=E5=A2=9E=E5=87=8F=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E5=85=AC=E5=8F=B8id=E3=80=82=E6=AF=8F?= =?UTF-8?q?=E6=AC=A1=E5=90=8C=E6=AD=A5=E5=8F=AA=E6=94=AF=E6=8C=811l?= =?UTF-8?q?=E5=8D=B3=E9=9C=96=E6=A2=93=E5=85=AC=E5=8F=B8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=88=A0=E9=99=A4=E9=9D=9E=E9=9C=96=E6=A2=93?= =?UTF-8?q?=E7=9A=84=E5=85=AC=E5=8F=B8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/StaffRoleController.java | 6 ++++-- .../com/lz/modules/app/controller/TestController.java | 4 ++-- .../java/com/lz/modules/app/dao/DepartmentsDao.java | 2 +- .../lz/modules/app/dao/DepartmentsStaffRelateDao.java | 2 +- src/main/java/com/lz/modules/app/dao/StaffDao.java | 2 +- .../app/entity/DepartmentsStaffRelateEntity.java | 4 ++++ .../java/com/lz/modules/app/entity/StaffEntity.java | 5 +++++ .../lz/modules/app/entity/StaffOccupationEntity.java | 5 +++++ .../com/lz/modules/app/service/DepartmentsService.java | 2 +- .../app/service/DepartmentsStaffRelateService.java | 2 +- .../java/com/lz/modules/app/service/StaffService.java | 2 +- .../app/service/impl/DepartmentsServiceImpl.java | 4 ++-- .../impl/DepartmentsStaffRelateServiceImpl.java | 4 ++-- .../lz/modules/app/service/impl/StaffServiceImpl.java | 4 ++-- .../flow/service/impl/FlowManagerServiceImpl.java | 8 +++++--- .../flow/service/impl/StaffRoleServiceImpl.java | 10 ++++++---- .../com/lz/modules/job/business/DingtalkBusiness.java | 10 ++++++---- .../sys/service/app/impl/ResultRecordServiceImpl.java | 4 +++- src/main/resources/mapper/generator/DepartmentsDao.xml | 2 +- .../mapper/generator/DepartmentsStaffRelateDao.xml | 3 ++- src/main/resources/mapper/generator/StaffDao.xml | 5 +++-- .../resources/mapper/generator/StaffOccupationDao.xml | 1 + src/test/java/com/lz/mysql/MysqlMain.java | 5 ++--- 23 files changed, 61 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index 2357fa80..830bf8dc 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -68,9 +68,11 @@ public class StaffRoleController extends AbstractController { @Autowired private DepartmentsStaffRelateService departmentsStaffRelateService; -@Autowired + @Autowired private StaffRoleEvaluationGroupService staffRoleEvaluationGroupService; + private static Long COMPANY_ID = 1l; + /** * 列表 */ @@ -122,7 +124,7 @@ public class StaffRoleController extends AbstractController { @RequestMapping("/info/{id}") public R info(@PathVariable("id") Long id) { StaffRole lzStaffRole = staffRoleService.selectStaffRoleById(id); - List staffEntityList = staffService.selectAll(); + List staffEntityList = staffService.selectAll(COMPANY_ID); List newList = new ArrayList<>(); staffEntityList.forEach(p -> { StaffEntity staffEntity = new StaffEntity(); diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index 1e7183f1..e59e9fd0 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -144,7 +144,7 @@ public class TestController { @RequestMapping("/test/relate") public void relate() { - List list = departmentsStaffRelateService.selectAll(); + List list = departmentsStaffRelateService.selectAll(1l); for (DepartmentsStaffRelateEntity l : list) { DepartmentsEntity departmentsEntity = departmentsService.selectByDepartmentId(l.getDepartmentId()); l.setLevel(departmentsEntity.getLevel()); @@ -242,7 +242,7 @@ public class TestController { // http://localhost:8080/lz_management/test/restore @RequestMapping("/test/restore") public void restore() throws Exception { - List staffEntities = staffService.selectAll(); + List staffEntities = staffService.selectAll(1l); for (StaffEntity staffEntity : staffEntities) { //doRestore(staffEntity.getId()); } diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java index a1b41cee..82150d18 100644 --- a/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java +++ b/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java @@ -33,7 +33,7 @@ public interface DepartmentsDao extends BaseMapper { List getDepartmentsByparentId(@Param("parentId") String parentId); - List selectAll(); + List selectAll(@Param("companyId") Long companyId); List selectEntityByParentDepartmentId(@Param("parentId") String parentId); diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java index b56ef436..1cc479f1 100644 --- a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java +++ b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java @@ -51,7 +51,7 @@ public interface DepartmentsStaffRelateDao extends BaseMapper selectByStaffIds(@Param("staffIds") List staffIds); - List selectAll(); + List selectAll(@Param("companyId") Long companyId); DepartmentsStaffRelateEntity selectLastDepartmentByStaffId(@Param("staffId") Long staffId); diff --git a/src/main/java/com/lz/modules/app/dao/StaffDao.java b/src/main/java/com/lz/modules/app/dao/StaffDao.java index 8a367679..f642404c 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java @@ -79,7 +79,7 @@ public interface StaffDao extends BaseMapper { List selectBySearchName(@Param("page") IPage page, @Param("model") FindByNameModel nameModel); - List selectAll(); + List selectAll(@Param("companyId") Long companyId); List getPositionByStaffIds(@Param("req") ReportListReq req, @Param("staffIds") List staffIds, @Param("page") IPage page); diff --git a/src/main/java/com/lz/modules/app/entity/DepartmentsStaffRelateEntity.java b/src/main/java/com/lz/modules/app/entity/DepartmentsStaffRelateEntity.java index de9c6f4b..e03b6320 100644 --- a/src/main/java/com/lz/modules/app/entity/DepartmentsStaffRelateEntity.java +++ b/src/main/java/com/lz/modules/app/entity/DepartmentsStaffRelateEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -35,6 +37,8 @@ public class DepartmentsStaffRelateEntity implements Serializable { private Long staffId; //第几级部门 private Integer level; + //公司id + private Long companyId; /*** * 是否为部门领导 */ diff --git a/src/main/java/com/lz/modules/app/entity/StaffEntity.java b/src/main/java/com/lz/modules/app/entity/StaffEntity.java index 3d22e43d..455cf5d7 100644 --- a/src/main/java/com/lz/modules/app/entity/StaffEntity.java +++ b/src/main/java/com/lz/modules/app/entity/StaffEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -125,5 +127,8 @@ public class StaffEntity implements Serializable { //盐 private String salt; + //公司id + private Long companyId; + } diff --git a/src/main/java/com/lz/modules/app/entity/StaffOccupationEntity.java b/src/main/java/com/lz/modules/app/entity/StaffOccupationEntity.java index 26ed9a84..92cc1658 100644 --- a/src/main/java/com/lz/modules/app/entity/StaffOccupationEntity.java +++ b/src/main/java/com/lz/modules/app/entity/StaffOccupationEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -105,6 +107,9 @@ public class StaffOccupationEntity implements Serializable { */ private String resumeUrl; + //公司id + private Long companyId; + public String getKey(){ return staffId + "_" + position; } diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsService.java b/src/main/java/com/lz/modules/app/service/DepartmentsService.java index 7e24eb72..84ce1a9e 100644 --- a/src/main/java/com/lz/modules/app/service/DepartmentsService.java +++ b/src/main/java/com/lz/modules/app/service/DepartmentsService.java @@ -58,7 +58,7 @@ public interface DepartmentsService extends IService { //查找父级部门 DepartmentsEntity selectParentDepartmentByDepartmentId(String departmentId); - List selectAll(); + List selectAll(Long companyId); int delDepartments(List departmentsEntities); diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java index df1e3271..d8abf394 100644 --- a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java +++ b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java @@ -29,7 +29,7 @@ public interface DepartmentsStaffRelateService extends IService selectAll(); + List selectAll(Long companyId); List selectByStaffIds(List staffIds); diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java index eddffc4d..d476ffb7 100644 --- a/src/main/java/com/lz/modules/app/service/StaffService.java +++ b/src/main/java/com/lz/modules/app/service/StaffService.java @@ -84,7 +84,7 @@ public interface StaffService extends IService { //统计部门下的人 List staffsByAllDeparmentIds(List deparmentIds); - List selectAll(); + List selectAll(Long companyId); List selectStaffSimpleInfoByIds(List ids); diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java index 18511d51..0689c56f 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java @@ -298,8 +298,8 @@ public class DepartmentsServiceImpl extends ServiceImpl selectAll(){ - return departmentsDao.selectAll(); + public List selectAll(Long companyId){ + return departmentsDao.selectAll(companyId); } @Override diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java index 1791d621..3e06e85d 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java @@ -64,8 +64,8 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl selectAll() { - return departmentsStaffRelateDao.selectAll(); + public List selectAll(Long companyId) { + return departmentsStaffRelateDao.selectAll(companyId); } @Override diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index d15ccc3d..59cc5cfa 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -426,8 +426,8 @@ public class StaffServiceImpl extends ServiceImpl impleme } @Override - public List selectAll() { - return staffDao.selectAll(); + public List selectAll(Long companyId) { + return staffDao.selectAll(companyId); } /** diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java index 78a1baaa..8085d519 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java @@ -53,6 +53,8 @@ public class FlowManagerServiceImpl extends ServiceImpl getFowList() { - List tDepartments = departmentsDao.selectAll(); + List tDepartments = departmentsDao.selectAll(COMPANY_ID); List parentDepartments = tDepartments.stream() //根据两个属性进行过滤 .filter(s -> s.getDepartmentParentId().equals("1")) .collect(Collectors.toList()); - List departmentsStaffRelateEntities = departmentsStaffRelateService.selectAll(); + List departmentsStaffRelateEntities = departmentsStaffRelateService.selectAll(COMPANY_ID); Map departmentsStaffRelateEntityMap = new HashMap<>(); Map singleRelateMap = new HashMap<>(); @@ -132,7 +134,7 @@ public class FlowManagerServiceImpl extends ServiceImpl staffEntities = staffDao.selectAll(); + List staffEntities = staffDao.selectAll(COMPANY_ID); Map staffMap = new HashMap<>(); for(StaffEntity staffEntity : staffEntities){ staffMap.put(staffEntity.getId(),staffEntity); diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index e37e9588..20665796 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -122,6 +122,8 @@ public class StaffRoleServiceImpl extends ServiceImpl menuIdList1 = new ArrayList<>(); if (staffRole != null) { List staffRoleDepartments = staffRoleDepartmentMapper.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); - List departmentsEntities = departmentsDao.selectAll(); + List departmentsEntities = departmentsDao.selectAll(COMPANY_ID); Map> map = resultRecordService.getStringListMap(departmentsEntities); role.setRoleId(staffRole.getId()); role.setRoleName(staffRole.getDepartmentLevel()); @@ -246,12 +248,12 @@ public class StaffRoleServiceImpl extends ServiceImpl selectMenuList() { - List tDepartments = departmentsDao.selectAll(); + List tDepartments = departmentsDao.selectAll(COMPANY_ID); List parentDepartments = tDepartments.stream() //根据两个属性进行过滤 .filter(s -> s.getDepartmentParentId().equals("1")) .collect(Collectors.toList()); - List departmentsStaffRelateEntities = departmentsStaffRelateService.selectAll(); + List departmentsStaffRelateEntities = departmentsStaffRelateService.selectAll(COMPANY_ID); Map departmentsStaffRelateEntityMap = new HashMap<>(); Map singleDepartmentsStaffRelate = new HashMap<>(); for (DepartmentsStaffRelateEntity d : departmentsStaffRelateEntities) { @@ -260,7 +262,7 @@ public class StaffRoleServiceImpl extends ServiceImpl staffEntities = staffDao.selectAll(); + List staffEntities = staffDao.selectAll(COMPANY_ID); Map staffMap = new HashMap<>(); for (StaffEntity staffEntity : staffEntities) { staffMap.put(staffEntity.getId(), staffEntity); diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index c61f6ec0..1f0aece5 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -121,6 +121,8 @@ public class DingtalkBusiness { @Value("${dingtalk.appid}") private String appid; + private static Long COMPANY_ID = 1l; + /** * 获取组织架构信息并录入到数据库 */ @@ -204,7 +206,7 @@ public class DingtalkBusiness { List newPositions = new ArrayList<>();//新的职位或者新的人员对应信息 //获取所有的部门详情 - List departmentInfosBos = dingTalkUtil.getDepartmentDetailsV2(token, "1"); + List departmentInfosBos = dingTalkUtil.getDepartmentDetailsV2(token, COMPANY_ID.toString()); if(departmentInfosBos.size() > 0){ List probationUserIDS = getProbationStaff(token);//获取试用期人员信息 @@ -216,7 +218,7 @@ public class DingtalkBusiness { //获取原有部门信息 Map mapDepartmentInfosBos = departmentInfosBos.stream().collect(Collectors.toMap(DepartmentInfosBo::getId, Function.identity(), (e, r) -> e)); - List departmentsEntities = departmentsService.selectAll(); + List departmentsEntities = departmentsService.selectAll(COMPANY_ID); Map mapDeparts = null; if(departmentsEntities.size() > 0){ mapDeparts = @@ -224,7 +226,7 @@ public class DingtalkBusiness { } //获取原有的部门人员对应关系 - List departmentsStaffRelateEntities = departmentsStaffRelateService.selectAll(); + List departmentsStaffRelateEntities = departmentsStaffRelateService.selectAll(COMPANY_ID); Map mapDepStaffs = null; if(departmentsStaffRelateEntities.size() > 0){ @@ -235,7 +237,7 @@ public class DingtalkBusiness { } //获取所有人员信息 - List staffEntities = staffService.selectAll(); + List staffEntities = staffService.selectAll(COMPANY_ID); Map mapStaffs = null; if(staffEntities.size() > 0){ mapStaffs = staffEntities.stream(). diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 2604273a..e6501ce2 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -154,6 +154,8 @@ public class ResultRecordServiceImpl extends ServiceImpl departmentIds = new ArrayList<>(); - List tDepartments = departmentsDao.selectAll(); + List tDepartments = departmentsDao.selectAll(COMPANY_ID); if (StringUtil.isNotBlank(params.getDepartment1()) || StringUtil.isNotBlank(params.getDepartment2()) || StringUtil.isNotBlank(params.getDepartment3())) { Map> departmentMap = null; diff --git a/src/main/resources/mapper/generator/DepartmentsDao.xml b/src/main/resources/mapper/generator/DepartmentsDao.xml index 7928da60..12cb0208 100644 --- a/src/main/resources/mapper/generator/DepartmentsDao.xml +++ b/src/main/resources/mapper/generator/DepartmentsDao.xml @@ -73,7 +73,7 @@ diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 656c2568..763b2bd4 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -85,9 +85,8 @@ public class MysqlMain { List list = new ArrayList(); - list.add(new TablesBean("lz_indicator_library")); - list.add(new TablesBean("lz_indicator_type")); - list.add(new TablesBean("lz_task_resp")); + list.add(new TablesBean("lz_departments_staff_relate")); + list.add(new TablesBean("lz_staff")); List list2 = new ArrayList();