Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -680,7 +680,7 @@
 	<select id="findAllUser" resultType="java.lang.String">
 		<!-- 查询全部用户 -->
 		SELECT
-			a.login_name AS "loginName"
+			a.name AS "name"
 		FROM sys_user a
 		WHERE a.del_flag = '0'
 	</select>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -471,7 +471,7 @@ public  class ProExcelInfo {
     }
     //进行导入角色筛选 项目经理
     public static List<Project> getSureProjectsManager(List<Project> projects){
-        String loginName = UserUtils.getUser().getLoginName();
+        String loginName = UserUtils.getUser().getName();
         for (int i = 0; i < projects.size(); i++) {
             if (null!=projects.get(i).getProjectManageRole()){//项目经理角色
                 if (!loginName.equals(projects.get(i).getProjectManageRole())){
@@ -485,7 +485,7 @@ public  class ProExcelInfo {
 
     //进行导入角色筛选
     public static List<Project> getSureProjects(List<Project> projects){
-        String loginName = UserUtils.getUser().getLoginName();
+        String loginName = UserUtils.getUser().getName();
         for (int i = 0; i < projects.size(); i++) {
             if (null!=projects.get(i).getProjectManageRole()){//项目经理角色
                 if (!loginName.equals(projects.get(i).getDistributionEngineering())){