修改业务超管默认角色名称

saas-account/src/main/java/com/persagy/person/controller/SaasLoginController.java

@@ -90,7 +90,7 @@ public class SaasLoginController {
     	if (SaasCommonConstant.STATUS_1 != account.getValid()) {
     		return ResponseResultUtil.errorResult(ResponseCode.A0220.getCode(), "此账号已停用");
 		}
-    	if (!account.getAppId().contains(loginVO.getAppId())) {
+    	if (!account.getTerminal().contains(loginVO.getAppId())) {
     		return ResponseResultUtil.errorResult(ResponseCode.A0220.getCode(), "此账号不允许在此端登录");
 		}
     	// 验证是否在有效期内
@@ -122,6 +122,7 @@ public class SaasLoginController {
     		List<SaasMenu> menuTree = this.querySaasMenuTree(account, loginVO.getAppId());
     		account.setAuths(menuTree);
     	}
+    	account.setAppId(loginVO.getAppId());
     	String token = this.setRedisToken(account, loginVO.getAppId(), loginVO.isRemember(), false);
     	response.setHeader(CipherConstans.TOKEN_HEADER_TOKEN, token);
     	return ResponseResultUtil.successResult(account);

saas-account/src/main/java/com/persagy/person/manage/SaasGroupProjectHandler.java

@@ -136,7 +136,7 @@ public class SaasGroupProjectHandler {
 				throw new BusinessException("集团默认分区添加失败");
 			}
 			// 生成一条默认的角色信息及角色，默认菜单的关联关系，这里的菜单先写死
-			this.saasRoleService.createDefaultRole(saasGroup.getGroupCode(), saasGroup.getGroupName(), saasGroup.getUpdateUser());
+			this.saasRoleService.createDefaultRole(saasGroup.getGroupCode(), saasGroup.getUpdateUser());
 		}
 		// 账号类型为其他类型的账号添加集团信息时，需要在ACCOUNT_PROJECT插入一条权限信息
 		if (result && SaasCommonConstant.STR_STATUS_2.equals(account.getAccountType())) {

saas-account/src/main/java/com/persagy/person/pojo/dto/SaasAccount.java

@@ -43,7 +43,10 @@ public class SaasAccount extends BaseEntity<SaasAccount> {
 	private String groupCode; // 集团编码
 
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY, typeHandler = FastjsonTypeHandler.class)
-	private Set<String> appId; // 应用ID， PC-电脑端，APP-手机端
+	private Set<String> terminal; // 应用ID， PC-电脑端，APP-手机端
+	
+	@TableField(exist = false)
+	private String appId; 	// 应用ID，返回给前端的，也即时登录时，指定的
 
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
 	private String username; // 登录用户名
@@ -166,12 +169,12 @@ public class SaasAccount extends BaseEntity<SaasAccount> {
 			return this;
 		}
 
-		public Builder appIdLike(String appId) {
+		public Builder terminalLike(String appId) {
 			if (StringUtil.isNotBlank(appId)) {
 				if (updateWrapper != null) {
-					updateWrapper.apply("APP_ID LIKE CONCAT('%', " + appId + ",'%')");
+					updateWrapper.apply("TERMINAL LIKE CONCAT('%', " + appId + ",'%')");
 				} else {
-					queryWrapper.apply("APP_ID LIKE CONCAT('%', " + appId + ",'%')");
+					queryWrapper.apply("TERMINAL LIKE CONCAT('%', " + appId + ",'%')");
 				}
 			}
 			return this;

saas-account/src/main/java/com/persagy/person/service/ISaasRoleService.java

@@ -44,11 +44,10 @@ public interface ISaasRoleService extends ISuperService<SaasRole> {
 	 * 生成一条默认的角色信息及角色，默认菜单的关联关系，这里的菜单先写死
 	 * 
 	 * @param groupCode
-	 * @param groupName
 	 * @param updateUser
 	 * @return
 	 */
-	boolean createDefaultRole(String groupCode, String groupName, String updateUser);
+	boolean createDefaultRole(String groupCode, String updateUser);
 
 }
 

saas-account/src/main/java/com/persagy/person/service/impl/SaasAccountServiceImpl.java

@@ -32,7 +32,7 @@ public class SaasAccountServiceImpl extends SuperServiceImpl<SaasAccountMapper,
 		LambdaQueryWrapper<SaasAccount> queryWrapper = new SaasAccount.Builder().createQueryWrapper()
 				.idEq(id).groupCodeEq(groupCode).usernameEq(username)
 				.validEq(SaasCommonConstant.STATUS_1).builderQueryWrapper();
-		queryWrapper.select(SaasAccount::getId, SaasAccount::getGroupCode, SaasAccount::getAppId, SaasAccount::getUsername,
+		queryWrapper.select(SaasAccount::getId, SaasAccount::getGroupCode, SaasAccount::getTerminal, SaasAccount::getUsername,
     			SaasAccount::getPhoneNum, SaasAccount::getMail, SaasAccount::getHeadPortrait, SaasAccount::getAccountBelong, 
     			SaasAccount::getAccountSource, SaasAccount::getAccountType, SaasAccount::getLastLoginIp, SaasAccount::getLastLoginTime,
     			SaasAccount::getValidStartTime, SaasAccount::getValidEndTime, SaasAccount::getValidLast, SaasAccount::getCreateTime,
@@ -72,7 +72,7 @@ public class SaasAccountServiceImpl extends SuperServiceImpl<SaasAccountMapper,
     			.groupCodeEq(saasAccount.getGroupCode()).usernameLike(saasAccount.getUsername()).accountTypeEq(saasAccount.getAccountType())
     			.accountSourceEq(saasAccount.getAccountSource()).phoneNumEq(saasAccount.getPhoneNum()).mailEq(saasAccount.getMail())
     			.accountBelongEq(saasAccount.getAccountBelong()).validEq(saasAccount.getValid()).builderQueryWrapper();
-    	queryWrapper.select(SaasAccount::getId, SaasAccount::getGroupCode, SaasAccount::getAppId, SaasAccount::getUsername,
+    	queryWrapper.select(SaasAccount::getId, SaasAccount::getGroupCode, SaasAccount::getTerminal, SaasAccount::getUsername,
     			SaasAccount::getPhoneNum, SaasAccount::getMail, SaasAccount::getHeadPortrait, SaasAccount::getAccountBelong, 
     			SaasAccount::getAccountSource, SaasAccount::getAccountType, SaasAccount::getLastLoginIp, SaasAccount::getLastLoginTime,
     			SaasAccount::getValidStartTime, SaasAccount::getValidEndTime, SaasAccount::getValidLast, SaasAccount::getCreateTime,
@@ -123,7 +123,7 @@ public class SaasAccountServiceImpl extends SuperServiceImpl<SaasAccountMapper,
     public LambdaQueryWrapper<SaasAccount> getQueryWrapperByUsername(SaasAccount saasAccount) {
         LambdaQueryWrapper<SaasAccount> queryWrapper = new SaasAccount.Builder().createQueryWrapper()
                 .groupCodeEq(saasAccount.getGroupCode()).usernameEq(saasAccount.getUsername()).builderQueryWrapper();
-        queryWrapper.select(SaasAccount::getId, SaasAccount::getGroupCode, SaasAccount::getAppId, SaasAccount::getUsername,
+        queryWrapper.select(SaasAccount::getId, SaasAccount::getGroupCode, SaasAccount::getTerminal, SaasAccount::getUsername,
                 SaasAccount::getPhoneNum, SaasAccount::getMail, SaasAccount::getHeadPortrait, SaasAccount::getAccountBelong,
                 SaasAccount::getAccountSource, SaasAccount::getAccountType, SaasAccount::getLastLoginIp, SaasAccount::getLastLoginTime,
                 SaasAccount::getValidStartTime, SaasAccount::getValidEndTime, SaasAccount::getValidLast, SaasAccount::getCreateTime,

saas-account/src/main/java/com/persagy/person/service/impl/SaasRoleServiceImpl.java

@@ -66,12 +66,12 @@ public class SaasRoleServiceImpl extends SuperServiceImpl<SaasRoleMapper, SaasRo
 
 	@Override
 	@Transactional
-	public boolean createDefaultRole(String groupCode, String groupName, String updateUser) {
+	public boolean createDefaultRole(String groupCode, String updateUser) {
 		Date date = new Date();
 		SaasRole saasRole = new SaasRole();
 		saasRole.setGroupCode(groupCode);
 		saasRole.setRoleCode("1001");
-		saasRole.setRoleName(groupName + "-超管默认角色");
+		saasRole.setRoleName("超级管理员");
 		saasRole.setRoleType(SaasCommonConstant.STR_STATUS_2);
 		saasRole.setRemark("自动创建默认业务超管角色");
 		saasRole.setCreateTime(date);

saas-account/src/main/resources/mapper/SaasAccountMapper.xml

@@ -6,7 +6,7 @@
 	<resultMap id="BaseResultMap" type="com.persagy.person.pojo.dto.SaasAccount">
 		<result column="ID" property="id" jdbcType="VARCHAR" />
 		<result column="GROUP_CODE" property="groupCode" jdbcType="VARCHAR" />
-		<result column="APP_ID" property="appId" 
+		<result column="TERMINAL" property="terminal" 
 			typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler" />
 		<result column="USERNAME" property="username" jdbcType="VARCHAR" />
 		<result column="PASSWORD" property="password" jdbcType="VARCHAR" />
@@ -31,7 +31,7 @@
 	</resultMap>
 	
 	<sql id="Base_Sql_Columns">
-		ID, GROUP_CODE, APP_ID, USERNAME, PHONE_NUM, MAIL, HEAD_PORTRAIT, ACCOUNT_TYPE, ACCOUNT_BELONG, ACCOUNT_SOURCE, LAST_LOGIN_TIME,
+		ID, GROUP_CODE, TERMINAL, USERNAME, PHONE_NUM, MAIL, HEAD_PORTRAIT, ACCOUNT_TYPE, ACCOUNT_BELONG, ACCOUNT_SOURCE, LAST_LOGIN_TIME,
 		LAST_LOGIN_IP, VALID_START_TIME, VALID_END_TIME, VALID_LAST, CREATE_TIME, UPDATE_TIME, UPDATE_USER, REMARK, VALID
 	</sql>
 	
@@ -41,7 +41,7 @@
 		<where>
 			<if test="account.id != null and account.id.trim().length() != 0">AND ID = #{account.id}</if>
 			<if test="account.groupCode != null and account.groupCode.trim().length() != 0">AND GROUP_CODE = #{account.groupCode}</if>
-			<if test="account.appId != null and account.appId.trim().length() != 0">AND APP_ID = #{account.appId}</if>
+			<if test="account.appId != null and account.appId.trim().length() != 0">AND TERMINAL LIKE CONCAT('%', #{account.appId}, '%')</if>
 			<if test="account.phoneNum != null and account.phoneNum.trim().length() != 0">AND PHONE_NUM = #{account.phoneNum}</if>
 			<if test="account.mail != null and account.mail.trim().length() != 0">AND MAIL = #{account.mail}</if>
 			<if test="account.username != null and account.username.trim().length() != 0">AND USERNAME LIKE CONCAT('%', #{account.username}, '%')</if>