Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/UserAccountMapper.java

@@ -77,7 +77,7 @@ public interface UserAccountMapper extends BaseMapper<UserAccount> {
      * @description 获取用户关联的项目信息
      * @date 2020/5/2 10:54 下午
      */
-    List<ProjectUser> getProjectUserList(ProjectUserRequest projectUserRequest);
+    List<ProjectUser> getProjectUsers(ProjectUserRequest projectUserRequest);
 
     /**
      * @param projectUserRequest 用户id集合

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IProjectService.java

@@ -106,7 +106,7 @@ public interface IProjectService {
      * @description 获取用户关联的项目信息
      * @date 2020/5/2 10:54 下午
      */
-    List<ProjectUser> getProjectUserList(ProjectUserRequest projectUserRequest);
+    List<ProjectUser> getProjectUsers(ProjectUserRequest projectUserRequest);
 
     /**
      * @param projectUserRequest 用户id集合

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MtCompanyUserService.java

@@ -249,7 +249,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
             Map<Long, LiftCertificate> userIdToLiftCertificate = ProjectUtils.attrToObjMap(liftCertificateList, "userId", null);
 
             //关联项目信息
-            List<ProjectUser> projectUserList = projectService.getProjectUserList(new ProjectUserRequest(
+            List<ProjectUser> projectUserList = projectService.getProjectUsers(new ProjectUserRequest(
                     mtCompanyUserRequest.getCompanyId(), userIdList));
             Map<Long, List<ProjectUser>> userIdToProjectUserList = new HashMap<>();
             if (projectUserList != null && projectUserList.size() > 0) {

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/ProjectService.java

@@ -133,7 +133,7 @@ public class ProjectService implements IProjectService {
 
     @Override
     public List<ProjectUser> getProjectUserList(ProjectUserRequest projectUserRequest) {
-        return userAccountMapper.getProjectUserList(projectUserRequest);
+        return userAccountMapper.getProjectUsers(projectUserRequest);
     }
 
     @Override

lift-system-service/src/main/resources/mapper/UserAccountMapper.xml

@@ -136,7 +136,7 @@
     </delete>
 
     <!-- 获取用户关联的项目信息 -->
-    <select id="getProjectUserList" parameterType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUserRequest"
+    <select id="getProjectUsers" parameterType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUserRequest"
             resultType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser">
         select pu.project_id as projectId,
                pu.user_id as userId