新增配置 user.loginCodeCorpUnique 登录账号租户内唯一

modules/core/src/main/resources/config/jeesite-core.yml

@@ -162,6 +162,9 @@ user:
   # 多租户模式（SAAS模式）（专业版）
   useCorpModel: false
   
+  # 登录账号是否租户内唯一，否则全局唯一
+  loginCodeCorpUnique: false
+  
   # 自助账号服务
   account:
     # 注册用户
@@ -375,6 +378,7 @@ shiro:
 #    ${adminPath}/cms/category/* = anon
 #    ${adminPath}/cms/article/* = anon
 #    ${adminPath}/cms/link/* = anon
+#    ${adminPath}/sys/corpAdmin/treeData = anon
 #    ${adminPath}/** = user
   filterChainDefinitions: |
     /ReportServer/** = user

modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html

@@ -24,15 +24,12 @@
 				<#form:input type="password" name="password" class="form-control required"
 					data-msg-required="${text('请填写登录密码.')}" placeholder="${text('登录密码')}" autocomplete="off"/>
 			</div>
-			<%/*<!-- if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %>
+			<% if(@Global.getConfigToBoolean('user.loginCodeCorpUnique', 'false')){ %>
 			<div class="form-group has-feedback">
-				<select name="param_corpCode" class="form-control">
-					<% for(var user in @UserUtils.findCorpList()){ %>
-						<option value="${user.corpCode}">(${user.corpCode}) ${user.corpName}</option>
-					<% } %>
-				</select>
+				<#form:treeselect id="switchCorpSelect" title="${text('登录租户')}" allowClear="false"
+					name="param_corpCode" url="${ctx}/sys/corpAdmin/treeData?isShowCode=true" placeholder="${text('登录租户')}"/>
 			</div>
-			<% } -->*/%>
+			<% } %>
 			<div class="form-group has-feedback" id="isValidCodeLogin" style="display:${isValidCodeLogin?'blank':'none'}">
 				<#form:validcode name="validCode" isRequired="true" isRemote="true" isLazy="true"/>
 			</div>