增加组织树接口

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/UserInfoHelper.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.common.helper;
 
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 
 import java.util.Collection;

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/RegionLimitHelperImpl.java

@@ -9,7 +9,7 @@ import com.hz.pm.api.expert.service.IExpertUserFullInfoService;
 import com.hz.pm.api.meta.model.bo.RegionContainsBO;
 import com.hz.pm.api.sys.model.entity.Region;
 import com.hz.pm.api.sys.service.IRegionService;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.service.IUserInfoService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/UserInfoHelperImpl.java

@@ -16,7 +16,7 @@ import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.model.entity.UserRole;
 import com.hz.pm.api.sys.service.IUserRoleService;
 import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.service.IUserInfoService;

hz-pm-api/src/main/java/com/hz/pm/api/ding/task/EmployeeBatchGetTask.java

@@ -14,7 +14,7 @@ import com.hz.pm.api.organization.model.entity.DingOrganization;
 import com.hz.pm.api.organization.service.IDingEmployeeInfoService;
 import com.hz.pm.api.organization.service.IDingOrganizationService;
 import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.ningdatech.zwdd.ZwddIntegrationProperties;
 import com.ningdatech.zwdd.client.ZwddAuthClient;

hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertManage.java

@@ -44,7 +44,7 @@ import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.model.entity.UserRole;
 import com.hz.pm.api.sys.service.IRoleService;
 import com.hz.pm.api.sys.service.IUserRoleService;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
 import com.hz.pm.api.user.service.IUserInfoService;

hz-pm-api/src/main/java/com/hz/pm/api/expert/service/impl/ExpertInfoServiceImpl.java

@@ -36,7 +36,7 @@ import com.hz.pm.api.sys.model.entity.UserRole;
 import com.hz.pm.api.sys.service.IRoleService;
 import com.hz.pm.api.sys.service.IUserRoleService;
 import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.service.IUserInfoService;

hz-pm-api/src/main/java/com/hz/pm/api/meeting/helper/MeetingCallOrMsgHelper.java

@@ -20,7 +20,7 @@ import com.hz.pm.api.staging.service.INdWorkNoticeStagingService;
 import com.hz.pm.api.sys.model.entity.Notify;
 import com.hz.pm.api.sys.service.INotifyService;
 import com.hz.pm.api.todocenter.bean.entity.WorkNoticeInfo;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.ningdatech.yxt.model.cmd.SendSmsCmd.SendSmsContext;
 import com.ningdatech.yxt.model.cmd.SubmitTaskCallCmd.SubmitTaskCallContext;

hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/CommonLogTask.java

@@ -16,7 +16,7 @@ import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.organization.mapper.DingEmployeeInfoMapper;
 import com.hz.pm.api.organization.model.entity.DingEmployeeInfo;
 import com.hz.pm.api.scheduler.task.model.CommonLog;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.service.IUserInfoService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningInstanceNotStartTask.java

@@ -23,7 +23,7 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.manage.EarlyWarningManage;
 import com.hz.pm.api.sys.manage.RoleManage;
 import com.hz.pm.api.sys.service.IProjectEarlyWarningService;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.wflow.bean.entity.WflowEarlyWarning;

hz-pm-api/src/main/java/com/hz/pm/api/sys/manage/NoticeManage.java

@@ -36,7 +36,7 @@ import com.hz.pm.api.sys.service.INoticeService;
 import com.hz.pm.api.sys.service.INotifyService;
 import com.hz.pm.api.todocenter.bean.entity.WorkNoticeInfo;
 import com.hz.pm.api.todocenter.model.dto.ProjectAuditMsgExtraDTO;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.service.IUserInfoService;

hz-pm-api/src/main/java/com/hz/pm/api/sys/manage/RoleManage.java

@@ -14,7 +14,7 @@ import com.hz.pm.api.sys.model.req.RolePageReq;
 import com.hz.pm.api.sys.model.vo.MenuRoleVO;
 import com.hz.pm.api.sys.model.vo.RoleVO;
 import com.hz.pm.api.sys.service.*;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.service.IUserInfoService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

hz-pm-api/src/main/java/com/hz/pm/api/sys/manage/UserGuidanceManage.java

@@ -14,8 +14,8 @@ import com.hz.pm.api.sys.model.entity.UserRole;
 import com.hz.pm.api.sys.model.vo.UserGuidanceDetailVO;
 import com.hz.pm.api.sys.model.vo.UserGuidanceVO;
 import com.hz.pm.api.sys.service.IUserRoleService;
-import com.hz.pm.api.user.entity.UserAuth;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserAuth;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.service.IUserAuthService;
 import com.hz.pm.api.user.service.IUserInfoService;

hz-pm-api/src/main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java

@@ -19,9 +19,9 @@ import com.hz.pm.api.meta.helper.DictionaryCache;
 import com.hz.pm.api.meta.model.dto.DictionaryDTO;
 import com.hz.pm.api.meta.model.entity.ExpertDictionary;
 import com.hz.pm.api.meta.service.IExpertDictionaryService;
-import com.hz.pm.api.user.entity.MhCompany;
-import com.hz.pm.api.user.entity.MhUnit;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.MhCompany;
+import com.hz.pm.api.user.model.entity.MhUnit;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
 import com.hz.pm.api.user.service.IMhCompanyService;
 import com.hz.pm.api.user.service.IMhUnitService;

hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java

@@ -19,7 +19,7 @@ import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.model.entity.UserRole;
 import com.hz.pm.api.sys.service.IRoleService;
 import com.hz.pm.api.sys.service.IUserRoleService;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
 import com.hz.pm.api.user.model.po.ReqUserDetailEditPO;
 import com.hz.pm.api.user.model.po.ReqUserDetailPO;

hz-pm-api/src/main/java/com/hz/pm/api/user/mapper/MhCompanyMapper.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hz.pm.api.user.entity.MhCompany;
+import com.hz.pm.api.user.model.entity.MhCompany;
 
 /**
  * <p>

hz-pm-api/src/main/java/com/hz/pm/api/user/mapper/MhUnitMapper.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.user.mapper;
 
-import com.hz.pm.api.user.entity.MhUnit;
+import com.hz.pm.api.user.model.entity.MhUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hz-pm-api/src/main/java/com/hz/pm/api/user/mapper/NdUserInfoMapper.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.user.mapper;
 
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hz-pm-api/src/main/java/com/hz/pm/api/user/mapper/UserAuthMapper.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.user.mapper;
 
-import com.hz.pm.api.user.entity.UserAuth;
+import com.hz.pm.api.user.model.entity.UserAuth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hz-pm-api/src/main/java/com/hz/pm/api/user/entity/MhCompany.java → hz-pm-api/src/main/java/com/hz/pm/api/user/model/entity/MhCompany.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.user.entity;
+package com.hz.pm.api.user.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

hz-pm-api/src/main/java/com/hz/pm/api/user/entity/MhUnit.java → hz-pm-api/src/main/java/com/hz/pm/api/user/model/entity/MhUnit.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.user.entity;
+package com.hz.pm.api.user.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

hz-pm-api/src/main/java/com/hz/pm/api/user/entity/UserAuth.java → hz-pm-api/src/main/java/com/hz/pm/api/user/model/entity/UserAuth.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.user.entity;
+package com.hz.pm.api.user.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

hz-pm-api/src/main/java/com/hz/pm/api/user/entity/UserInfo.java → hz-pm-api/src/main/java/com/hz/pm/api/user/model/entity/UserInfo.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.user.entity;
+package com.hz.pm.api.user.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;

hz-pm-api/src/main/java/com/hz/pm/api/user/service/IMhCompanyService.java

@@ -3,7 +3,7 @@ package com.hz.pm.api.user.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hz.pm.api.user.entity.MhCompany;
+import com.hz.pm.api.user.model.entity.MhCompany;
 import com.ningdatech.basic.util.CollUtils;
 
 import java.util.Collection;

hz-pm-api/src/main/java/com/hz/pm/api/user/service/IMhUnitService.java

@@ -2,7 +2,7 @@ package com.hz.pm.api.user.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hz.pm.api.user.entity.MhUnit;
+import com.hz.pm.api.user.model.entity.MhUnit;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ningdatech.basic.util.CollUtils;
 

hz-pm-api/src/main/java/com/hz/pm/api/user/service/IUserAuthService.java

@@ -1,8 +1,8 @@
 package com.hz.pm.api.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hz.pm.api.user.entity.UserAuth;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserAuth;
+import com.hz.pm.api.user.model.entity.UserInfo;
 
 import java.util.Map;
 import java.util.Set;

hz-pm-api/src/main/java/com/hz/pm/api/user/service/IUserInfoService.java

@@ -3,7 +3,7 @@ package com.hz.pm.api.user.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.ningdatech.basic.util.CollUtils;
 
 import java.util.Collection;

hz-pm-api/src/main/java/com/hz/pm/api/user/service/impl/MhCompanyServiceImpl.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.user.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hz.pm.api.user.entity.MhCompany;
+import com.hz.pm.api.user.model.entity.MhCompany;
 import com.hz.pm.api.user.mapper.MhCompanyMapper;
 import com.hz.pm.api.user.service.IMhCompanyService;
 import org.springframework.stereotype.Service;

hz-pm-api/src/main/java/com/hz/pm/api/user/service/impl/MhUnitServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.user.service.impl;
 
-import com.hz.pm.api.user.entity.MhUnit;
+import com.hz.pm.api.user.model.entity.MhUnit;
 import com.hz.pm.api.user.mapper.MhUnitMapper;
 import com.hz.pm.api.user.service.IMhUnitService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

hz-pm-api/src/main/java/com/hz/pm/api/user/service/impl/UserAuthServiceImpl.java

@@ -1,8 +1,8 @@
 package com.hz.pm.api.user.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hz.pm.api.user.entity.UserAuth;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserAuth;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.mapper.NdUserInfoMapper;
 import com.hz.pm.api.user.mapper.UserAuthMapper;
 import com.hz.pm.api.user.service.IUserAuthService;

hz-pm-api/src/main/java/com/hz/pm/api/user/service/impl/UserInfoServiceImpl.java

@@ -3,7 +3,7 @@ package com.hz.pm.api.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.mapper.NdUserInfoMapper;
 import com.hz.pm.api.user.service.IUserInfoService;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/test/java/com/hz/pm/api/irs/EmployeeTest.java

@@ -13,7 +13,7 @@ import com.hz.pm.api.organization.model.entity.DingOrganization;
 import com.hz.pm.api.organization.service.IDingEmployeeInfoService;
 import com.hz.pm.api.organization.service.IDingOrganizationService;
 import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
-import com.hz.pm.api.user.entity.UserInfo;
+import com.hz.pm.api.user.model.entity.UserInfo;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.ningdatech.zwdd.ZwddIntegrationProperties;
 import com.ningdatech.zwdd.client.ZwddClient;