20230223项目用户没有项目角色,无法登录系统
This commit is contained in:
		
							parent
							
								
									e2076c4d4b
								
							
						
					
					
						commit
						1e79fa5a96
					
				
										
											Binary file not shown.
										
									
								
							|  | @ -1769,6 +1769,7 @@ | ||||||
|     <Content Include="File\Word\HSSE\HSE隐患整改通知单.doc" /> |     <Content Include="File\Word\HSSE\HSE隐患整改通知单.doc" /> | ||||||
|     <Content Include="File\Word\HSSE\工程暂停令.doc" /> |     <Content Include="File\Word\HSSE\工程暂停令.doc" /> | ||||||
|     <Content Include="File\Excel\DataIn\现场人员考勤导入模版.xls" /> |     <Content Include="File\Excel\DataIn\现场人员考勤导入模版.xls" /> | ||||||
|  |     <Fakes Include="Fakes\RestSharp.fakes" /> | ||||||
|     <None Include="packages.config" /> |     <None Include="packages.config" /> | ||||||
|     <Content Include="ReportPrint\ReportTabFile\分包商上传周报.tab" /> |     <Content Include="ReportPrint\ReportTabFile\分包商上传周报.tab" /> | ||||||
|     <Content Include="ReportPrint\ReportTabFile\HSSE日志暨管理数据收集.tab" /> |     <Content Include="ReportPrint\ReportTabFile\HSSE日志暨管理数据收集.tab" /> | ||||||
|  | @ -15484,7 +15485,7 @@ | ||||||
|           <DevelopmentServerPort>0</DevelopmentServerPort> |           <DevelopmentServerPort>0</DevelopmentServerPort> | ||||||
|           <DevelopmentServerVPath> |           <DevelopmentServerVPath> | ||||||
|           </DevelopmentServerVPath> |           </DevelopmentServerVPath> | ||||||
|           <IISUrl>http://localhost:8118/</IISUrl> |           <IISUrl>http://localhost:3345/</IISUrl> | ||||||
|           <NTLMAuthentication>False</NTLMAuthentication> |           <NTLMAuthentication>False</NTLMAuthentication> | ||||||
|           <UseCustomServer>False</UseCustomServer> |           <UseCustomServer>False</UseCustomServer> | ||||||
|           <CustomServerUrl> |           <CustomServerUrl> | ||||||
|  |  | ||||||
|  | @ -604,17 +604,21 @@ namespace FineUIPro.Web | ||||||
|             { |             { | ||||||
|                 string roleTypes = string.Empty; |                 string roleTypes = string.Empty; | ||||||
|                 string roleCNs = string.Empty; |                 string roleCNs = string.Empty; | ||||||
|                 string[] roles = projectUser.RoleId.Split(','); |                 if (projectUser.RoleId != null && projectUser.RoleId.Length > 0) | ||||||
|                 foreach (var item in roles) |  | ||||||
|                 { |                 { | ||||||
|                     var role = BLL.RoleService.GetRoleByRoleId(item); |                     string[] roles = projectUser.RoleId.Split(','); | ||||||
|                     if (role != null && !string.IsNullOrEmpty(role.RoleType)) | 
 | ||||||
|  |                     foreach (var item in roles) | ||||||
|                     { |                     { | ||||||
|                         roleTypes = role.RoleType + ","; |                         var role = BLL.RoleService.GetRoleByRoleId(item); | ||||||
|                     } |                         if (role != null && !string.IsNullOrEmpty(role.RoleType)) | ||||||
|                     if (role != null && !string.IsNullOrEmpty(role.CNProfessionalIds)) |                         { | ||||||
|                     { |                             roleTypes = role.RoleType + ","; | ||||||
|                         roleCNs = role.CNProfessionalIds + ","; |                         } | ||||||
|  |                         if (role != null && !string.IsNullOrEmpty(role.CNProfessionalIds)) | ||||||
|  |                         { | ||||||
|  |                             roleCNs = role.CNProfessionalIds + ","; | ||||||
|  |                         } | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|                 if (roleTypes.Contains(Const.Role_III)) |                 if (roleTypes.Contains(Const.Role_III)) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue