Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -65,8 +65,8 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 	@Autowired
 	private ClientDetailsService clientDetailsService;
 
-//	@Value("${message.lesseeOrganId}")
-//	private Integer lesseeOrganId;
+	@Value("${auth.sysconfig.tenantId}")
+	private Integer tenantClientId;
 
 	@Autowired
 	private AuthorizationServerTokenServices defaultAuthorizationServerTokenServices;
@@ -141,11 +141,11 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 			if (StringUtils.equalsIgnoreCase(clientId, "TEACHER")) {
 				// 查询老师所在分部
 				Integer organId = userFeignService.queryTeacherOrganId(sysUser.getId());
-				if (organId == 43) {
+				if (organId == tenantClientId) {
 					tenantId = "2";
 				}
 			} else if (StringUtils.equalsIgnoreCase(clientId, "STUDENT")) {
-				if (sysUser.getOrganId() == 43) {
+				if (sysUser.getOrganId() == tenantClientId) {
 					tenantId = "2";
 				}
 			}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -66,4 +66,10 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @return
 	 */
 	Integer getTeacherOrganId(Integer userId);
+
+	/**
+	 * 创建租户账户表
+	 * @param userId
+	 */
+    void insertSysTenantAccount(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -35,10 +35,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Autowired
 	private SysRoleMenuService sysRoleMenuService;
-
 	@Autowired
 	private ImFeignService imFeignService;
-	
 	@Autowired
 	private UserFeignService userFeignService;
 
@@ -154,6 +152,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 			//添加用户现金账户
 			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
 			userFeignService.createCashAccount(sysUser.getId());
+			//sysTenantAccount
+			sysUserDao.insertSysTenantAccount(sysUser.getId());
 			//创建teacher表
 			sysUserDao.insertTeacher(sysUser.getId(),lesseeOrganId);
 			return queryUserInfoByPhone(phone);

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -75,6 +75,11 @@
         INSERT INTO teacher
         (id_,organ_id_,create_time_,update_time_)VALUES(#{userId},#{lesseeOrganId},NOW(),NOW())
     </insert>
+    <insert id="insertSysTenantAccount">
+        INSERT INTO sys_tenant_account
+        (user_id_,available_minutes_,frozen_minutes_,status_,create_time_,update_time_)
+		VALUES(#{userId},0,0,1,NOW(),NOW())
+    </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.auth.api.entity.SysUser">