Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/entity/SysRole.java

@@ -31,6 +31,8 @@ public class SysRole {
 	
 	/**  */
 	private java.util.Date updateTime;
+
+	private String tenantId;
 	
 	/** 删除标识（0-正常,1-删除） */
 	@ApiModelProperty(value = "删除标识（0-正常,1-删除）",required = false)
@@ -41,6 +43,14 @@ public class SysRole {
 	@ApiModelProperty(value = "菜单列表",required = false)
 	private List<Integer> menuIds;
 
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public List<Integer> getMenuIds() {
 		return menuIds;
 	}

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/entity/SysRoleMenu.java

@@ -16,11 +16,21 @@ public class SysRoleMenu {
 	@ApiModelProperty(value = "菜单ID",required = false)
 	private Integer menuId;
 
+	private String tenantId;
+
 	public SysRoleMenu(Integer roleId, Integer menuId) {
 		this.roleId = roleId;
 		this.menuId = menuId;
 	}
 
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public SysRoleMenu() {
 	}
 

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/entity/SysUser.java

@@ -97,6 +97,16 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "用户角色",required = false)
 	private List<Integer> roles;
 
+	private String tenantId;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public String getRealName() {
 		return realName;
 	}

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -1,20 +1,22 @@
 package com.keao.edu.auth.core.handler;
 
-import java.io.IOException;
-import java.util.Base64;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.auth.api.entity.SysUserLogin;
+import com.keao.edu.auth.api.entity.SysUserLoginLog;
+import com.keao.edu.auth.api.util.SecurityConstants;
+import com.keao.edu.auth.service.SysUserLoginLogService;
+import com.keao.edu.auth.service.SysUserLoginService;
+import com.keao.edu.auth.service.SysUserService;
+import com.keao.edu.common.entity.HttpResponseResult;
+import com.keao.edu.im.api.client.ImFeignService;
+import com.keao.edu.im.api.entity.ImResult;
+import com.keao.edu.im.api.entity.ImUserModel;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -22,27 +24,18 @@ import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException;
-import org.springframework.security.oauth2.provider.ClientDetails;
-import org.springframework.security.oauth2.provider.ClientDetailsService;
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
-import org.springframework.security.oauth2.provider.OAuth2Request;
-import org.springframework.security.oauth2.provider.TokenRequest;
+import org.springframework.security.oauth2.provider.*;
 import org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.auth.api.entity.SysUserLogin;
-import com.keao.edu.auth.api.entity.SysUserLoginLog;
-import com.keao.edu.auth.api.util.SecurityConstants;
-import com.keao.edu.auth.service.SysUserLoginLogService;
-import com.keao.edu.auth.service.SysUserLoginService;
-import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.im.api.client.ImFeignService;
-import com.keao.edu.im.api.entity.ImResult;
-import com.keao.edu.im.api.entity.ImUserModel;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Component
 public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuthenticationSuccessHandler {
@@ -61,9 +54,6 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 	@Autowired
 	private ClientDetailsService clientDetailsService;
 
-	@Value("${auth.sysconfig.tenantId}")
-	private Integer tenantClientId;
-
 	@Autowired
 	private AuthorizationServerTokenServices defaultAuthorizationServerTokenServices;
 

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/impl/SysUserServiceImpl.java

@@ -32,11 +32,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Autowired
 	private ImFeignService imFeignService;
 
-	@Value("${message.autoRegister}")
-	private boolean autoRegister;
-	@Value("${auth.sysconfig.tenantId}")
-	private Integer lesseeOrganId;
-
 	@Override
 	public BaseDAO<Integer, SysUser> getDAO() {
 		return sysUserDao;
@@ -93,11 +88,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Override
 	public boolean deleteById(Integer id) {
 		SysUser user = get(id);
-
 		if (user == null) {
 			throw new BizException("账户不存在");
 		}
-
 		user.setUpdateTime(new Date());
 		user.setDelFlag(1);
 

edu-auth/edu-auth-server/src/main/resources/application.yml

@@ -87,9 +87,4 @@ ribbon:
   ConnectTimeout: 60000
 
 message:
-  autoRegister: true
-  debugMode: true
-
-auth:
-  sysconfig:
-    tenantId: 1
+  debugMode: true

edu-auth/edu-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -15,6 +15,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="organ_id_" property="organId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -30,8 +31,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.keao.edu.auth.api.entity.SysRole" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,organ_id_)
-        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{organId})
+        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,organ_id_,tenant_id_)
+        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{organId},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -56,6 +57,9 @@
             <if test="organId != null">
                 organ_id_ = #{organId},
             </if>
+            <if test="tenantId != null">
+                tenant_id_ = #{tenantId},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

edu-auth/edu-auth-server/src/main/resources/config/mybatis/SysRoleMenuMapper.xml

@@ -9,6 +9,7 @@
 	<resultMap type="com.keao.edu.auth.api.entity.SysRoleMenu" id="SysRoleMenu">
 		<result column="role_id_" property="roleId" />
 		<result column="menu_id_" property="menuId" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -23,17 +24,12 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.auth.api.entity.SysRoleMenu" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_role_menu (role_id_,menu_id_) VALUES(#{roleId},#{menuId})
+		INSERT INTO sys_role_menu (role_id_,menu_id_,tenant_id_) VALUES(#{roleId},#{menuId},#{tenantId})
 	</insert>
     <insert id="batchAdd">
-		INSERT INTO sys_role_menu (role_id_,menu_id_) VALUES
+		INSERT INTO sys_role_menu (role_id_,menu_id_,tenant_id_) VALUES
 		<foreach collection="menuIds" item="item" index="index" separator=",">
-			(#{roleId},#{item})
+			(#{roleId},#{item},#{tenantId})
 		</foreach>
 	</insert>
 

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

@@ -29,6 +29,7 @@
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
         <result column="is_super_admin_" property="isSuperAdmin"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 查询条件 -->
@@ -59,9 +60,9 @@
             keyProperty="id">
         INSERT INTO sys_user
         (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,
-        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
+        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,tenant_id_)
         VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -126,7 +127,10 @@
                 real_name_ = #{realName},
             </if>
             <if test="isSuperAdmin != null">
-                is_super_admin_ = #{isSuperAdmin}
+                is_super_admin_ = #{isSuperAdmin},
+            </if>
+            <if test="tenantId != null">
+                tenant_id_ = #{tenantId},
             </if>
         </set>
         WHERE id_ = #{id}

edu-common/src/main/java/com/keao/edu/common/entity/SysConfig.java

@@ -31,7 +31,17 @@ public class SysConfig {
 	
 	@ApiModelProperty(value = "消息组", required = true)
 	private String group;
-	
+
+	private String tenantId;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

edu-datasource/src/main/java/com/keao/edu/datasource/DataSourceConfig.java

@@ -40,7 +40,6 @@ public class DataSourceConfig {
 		dynamicDataSource.setTargetDataSources(dataSourceMap);
 		return dynamicDataSource;
 	}
-
 	@Bean
 	public SqlSessionFactoryBean sqlSessionFactoryBean() throws Exception {
 		SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -1,23 +1,5 @@
 package com.keao.edu.im.service.Impl;
 
-import com.keao.edu.im.whiteboard.WhiteBoardHelper;
-import io.rong.models.message.GroupMessage;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson.JSONObject;
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
@@ -33,41 +15,28 @@ import com.keao.edu.im.dao.UserDao;
 import com.keao.edu.im.dao.WhiteboardDao;
 import com.keao.edu.im.job.ScheduleManager;
 import com.keao.edu.im.mec.im.IMHelper;
-import com.keao.edu.im.mec.im.message.ApplyForSpeechMessage;
-import com.keao.edu.im.mec.im.message.AssistantTransferMessage;
-import com.keao.edu.im.mec.im.message.ControlDeviceNotifyMessage;
-import com.keao.edu.im.mec.im.message.DeviceStateChangedMessage;
-import com.keao.edu.im.mec.im.message.DisplayMessage;
-import com.keao.edu.im.mec.im.message.MemberChangedMessage;
-import com.keao.edu.im.mec.im.message.RoleChangedMessage;
-import com.keao.edu.im.mec.im.message.SpeechResultMessage;
-import com.keao.edu.im.mec.im.message.TurnPageMessage;
-import com.keao.edu.im.mec.im.message.UpgradeRoleMessage;
-import com.keao.edu.im.mec.im.message.WhiteboardMessage;
-import com.keao.edu.im.pojo.ActionEnum;
-import com.keao.edu.im.pojo.ControlDeviceTaskInfo;
-import com.keao.edu.im.pojo.CustomMessage;
-import com.keao.edu.im.pojo.DeviceTypeEnum;
-import com.keao.edu.im.pojo.IMApiResultInfo;
-import com.keao.edu.im.pojo.PlayMidiMessageData;
-import com.keao.edu.im.pojo.ReqChangeUserRoleData;
-import com.keao.edu.im.pojo.ReqDeviceControlData;
-import com.keao.edu.im.pojo.ReqMemberOnlineStatus;
-import com.keao.edu.im.pojo.RoleEnum;
-import com.keao.edu.im.pojo.Room;
-import com.keao.edu.im.pojo.RoomMember;
-import com.keao.edu.im.pojo.RoomResult;
-import com.keao.edu.im.pojo.ScheduledTaskInfo;
-import com.keao.edu.im.pojo.UpgradeRoleTaskInfo;
-import com.keao.edu.im.pojo.UserInfo;
-import com.keao.edu.im.pojo.WhiteBoardApiResultInfo;
-import com.keao.edu.im.pojo.Whiteboard;
+import com.keao.edu.im.mec.im.message.*;
+import com.keao.edu.im.pojo.*;
 import com.keao.edu.im.service.MessageService;
 import com.keao.edu.im.service.RoomService;
 import com.keao.edu.im.utils.CheckUtils;
 import com.keao.edu.im.utils.CodeUtil;
 import com.keao.edu.im.utils.DateTimeUtils;
 import com.keao.edu.im.utils.IdentifierUtils;
+import com.keao.edu.im.whiteboard.WhiteBoardHelper;
+import io.rong.models.message.GroupMessage;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Created by super_zou on 2019/11/28.
@@ -108,9 +77,6 @@ public class RoomServiceImpl implements RoomService {
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    @Value("${auth.sysconfig.tenantId}")
-    private Integer lesseeOrganId;
-
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     @Override
     public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera,boolean isMusicMode) throws ApiException, Exception {

edu-im/edu-im-server/src/main/java/com/keao/edu/im/whiteboard/WhiteBoardHelper.java

@@ -20,7 +20,6 @@ public class WhiteBoardHelper {
 
     @Autowired
     HttpHelper httpHelper;
-
     @Autowired
     WhiteBoardProperties whiteBoardProperties;
     @Autowired

edu-im/edu-im-server/src/main/resources/application.yml

@@ -111,9 +111,5 @@ cn:
       roomTtl: 7200000
       userIMOfflineKickTtl: 300000
 
-auth:
-  sysconfig:
-    tenantId: 1
-
 message:
   debugMode: true

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Agency.java

@@ -36,6 +36,16 @@ public class Agency {
 	@ApiModelProperty(value = "是否删除",required = false)
 	private Integer delFlag;
 
+	private String tenantId;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public Integer getDelFlag() {
 		return delFlag;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Employee.java

@@ -72,6 +72,16 @@ public class Employee {
 	@ApiModelProperty(value = "员工信息",required = false)
 	private SysUser sysUser;
 
+	private String tenantId;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public Integer getDelFlag() {
 		return delFlag;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamLocation.java

@@ -31,7 +31,17 @@ public class ExamLocation {
 	private java.util.Date createTime;
 
 	private java.util.Date updateTime;
-	
+
+	private String tenantId;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamSong.java

@@ -34,7 +34,17 @@ public class ExamSong {
 	private java.util.Date createTime;
 
 	private java.util.Date updateTime;
-	
+
+	private String tenantId;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Subject.java

@@ -36,6 +36,16 @@ public class Subject {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Subject> subjects;
 
+	private String tenantId;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public List<Subject> getSubjects() {
 		return subjects;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Teacher.java

@@ -37,6 +37,16 @@ public class Teacher {
 	@ApiModelProperty(value = "用户编号",required = false)
 	private SysUser sysUser;
 
+	private String tenantId;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public YesOrNoEnum getDelFlag() {
 		return delFlag;
 	}

edu-user/edu-user-server/src/main/resources/config/mybatis/AgencyMapper.xml

@@ -15,6 +15,7 @@
 		<result column="share_profit_amount" property="shareProfitAmount" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -29,8 +30,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Agency" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO agency (id_,name_,contact_name_,contact_phone_,settlement_type_,share_profit_amount,create_time_,update_time_)
-		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{settlementType},#{shareProfitAmount},#{createTime},#{updateTime})
+		INSERT INTO agency (id_,name_,contact_name_,contact_phone_,settlement_type_,share_profit_amount,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{settlementType},#{shareProfitAmount},#{createTime},#{updateTime},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -60,6 +61,9 @@
 		<if test="createTime != null">
 		create_time_ = #{createTime},
 		</if>
+		<if test="tenantId != null">
+			tenant_id_ = #{tenantId},
+		</if>
 		</set> WHERE id_ = #{id}
 	</update>
 	

edu-user/edu-user-server/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -23,6 +23,7 @@
 		<result column="postal_code_" property="postalCode" />
 		<result column="role_name_" property="roleName" />
 		<result column="del_flag_" property="delFlag" />
+		<result column="tenant_id_" property="tenantId" />
 		<association property="sysUser" javaType="com.keao.edu.auth.api.entity.SysUser">
 			<result column="id_" property="id"/>
 			<result column="username_" property="username"/>
@@ -46,6 +47,7 @@
 			<result column="id_card_no_" property="idCardNo"/>
 			<result column="wechat_id_" property="wechatId"/>
 			<result column="is_super_admin_" property="isSuperAdmin"/>
+			<result column="tenant_id_" property="tenantId"/>
 		</association>
 	</resultMap>
 
@@ -66,9 +68,9 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Employee" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO employee (user_id_,job_nature_,education_background_,graduate_school_,technical_titles_,entry_date_,
-		certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_)
+		certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,tenant_id_)
 		VALUES(#{userId},#{jobNature},#{educationBackground},#{graduateSchool},#{technicalTitles},#{entryDate},#{certificateType},
-		#{certificateNum},#{updateTime},#{createTime},#{introduction},#{demissionDate},#{contactAddress},#{postalCode})
+		#{certificateNum},#{updateTime},#{createTime},#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -116,6 +118,9 @@
 		<if test="demissionDate != null">
 		demission_date_ = #{demissionDate},
 		</if>
+		<if test="tenantId != null">
+			tenant_id_=#{tenantId}
+		</if>
 		</set> WHERE user_id_ = #{userId}
 	</update>
     <insert id="batchAddEmployeeRole">

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamLocationMapper.xml

@@ -15,6 +15,7 @@
 		<result column="is_available_" property="isAvailable" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -29,8 +30,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamLocation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_location (id_,name_,contact_name_,contact_phone_,address_,is_available_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{address},#{isAvailable},NOW(),NOW())
+		INSERT INTO exam_location (id_,name_,contact_name_,contact_phone_,address_,is_available_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{address},#{isAvailable},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -61,6 +62,9 @@
 			<if test="createTime != null">
 				create_time_ = #{createTime},
 			</if>
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
+			</if>
 			update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamSongMapper.xml

@@ -16,6 +16,7 @@
 		<result column="file_url_list_" property="fileUrlList" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -30,8 +31,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamSong" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_song (id_,song_name_,song_author_,subject_list_,level_list_,type_,file_url_list_,create_time_,update_time_)
-		VALUES(#{id},#{songName},#{songAuthor},#{subjectList},#{levelList},#{type, typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{fileUrlList},NOW(),NOW())
+		INSERT INTO exam_song (id_,song_name_,song_author_,subject_list_,level_list_,type_,file_url_list_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{songName},#{songAuthor},#{subjectList},#{levelList},#{type, typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{fileUrlList},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -65,6 +66,9 @@
 			<if test="createTime != null">
 				create_time_ = #{createTime},
 			</if>
+			<if test="tenantId">
+				tenant_id_ = #{tenantId},
+			</if>
 			update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>
@@ -96,7 +100,7 @@
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		<include refid="queryCondition"/>
 		SELECT COUNT(*) FROM exam_song
+		<include refid="queryCondition"/>
 	</select>
 </mapper>

edu-user/edu-user-server/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -15,6 +15,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -30,8 +31,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.keao.edu.user.entity.Subject" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,tenant_id_)
-        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{tenantId})
+        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,tenant_id_,tenant_id_)
+        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{tenantId},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -56,6 +57,9 @@
             <if test="name != null">
                 name_ = #{name},
             </if>
+            <if test="tenantId!=null">
+                tenant_id_ = #{tenantId},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

edu-user/edu-user-server/src/main/resources/config/mybatis/SysConfigMapper.xml

@@ -11,6 +11,7 @@
 		<result column="create_on_" property="createOn" />
 		<result column="modify_on_" property="modifyOn" />
 		<result column="group_" property="group" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -33,8 +34,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_config
-		(id_,param_name_,paran_value_,description_,create_on_,modify_on_,group_)
-		VALUES(#{id},#{paramName},#{paranValue},#{description},#{createOn},#{modifyOn},#{group})
+		(id_,param_name_,paran_value_,description_,create_on_,modify_on_,group_,tenant_id_)
+		VALUES(#{id},#{paramName},#{paranValue},#{description},#{createOn},#{modifyOn},#{group},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -54,7 +55,10 @@
 				param_name_ = #{paramName},
 			</if>
 			<if test="group != null">
-				group_ = #{group}
+				group_ = #{group},
+			</if>
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
 			</if>
 		</set>
 		WHERE id_ = #{id}

edu-user/edu-user-server/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -15,6 +15,7 @@
 		<result column="del_flag_" property="delFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
 		<association property="sysUser" javaType="com.keao.edu.auth.api.entity.SysUser">
 			<result column="id_" property="id"/>
 			<result column="username_" property="username"/>
@@ -65,9 +66,10 @@
 			<if test="salary != null">
 				salary_ = #{salary},
 			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime}
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
 			</if>
+			update_time_ = NOW()
 		</set>
 		WHERE id_ = #{id}
 	</update>
@@ -80,8 +82,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Teacher" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO teacher (user_id_,title_,subject_id_list_,salary_settlement_type_,salary_,create_time_,update_time_)
-		VALUES(#{userId},#{title},#{subjectIdList},#{salarySettlementType},#{salary},NOW(),NOW())
+		INSERT INTO teacher (user_id_,title_,subject_id_list_,salary_settlement_type_,salary_,create_time_,update_time_,tenant_id_)
+		VALUES(#{userId},#{title},#{subjectIdList},#{salarySettlementType},#{salary},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<update id="delete">