Merge remote-tracking branch 'origin/master'

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

@@ -97,7 +97,7 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "用户角色",required = false)
 	private Set<Integer> roles;
 
-	private String tenantId;
+//	private String tenantId;
 
 	public SysUser() {
 	}
@@ -107,13 +107,13 @@ public class SysUser implements Serializable{
 		this.realName = realName;
 	}
 
-	public String getTenantId() {
+	/*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

@@ -124,6 +124,7 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 			map.put("password", StringUtils.isEmpty(sysUser.getPassword())?false:true);
 			map.put("authentication",oAuth2AccessToken);
 			map.put("tenantId", sysUserService.queryUserTenantId(clientId,sysUser.getId()));
+			map.put("organId", sysUserService.queryUserOrganId(clientId,sysUser.getId()));
 
 			response.setContentType("application/json; charset=utf-8");
 			HttpResponseResult result = new HttpResponseResult(true, HttpStatus.OK.value(), map, "");

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/dal/dao/SysUserDao.java

@@ -62,4 +62,8 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
     Integer getEmployeeTenantId(Integer userId);
 
 	Integer getTeacherTenantId(Integer userId);
+
+	Integer getTeacherOrganId(Integer userId);
+
+	Integer getEmployeeOrganId(Integer userId);
 }

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

@@ -106,8 +106,16 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	/**
 	 * 获取用户tenantId
 	 * @param clientId
-	 * @param id
+	 * @param userId
+	 * @return
+	 */
+	Integer queryUserTenantId(String clientId, Integer userId);
+
+	/**
+	 * 获取用户organId
+	 * @param clientId
+	 * @param userId
 	 * @return
 	 */
-	Integer queryUserTenantId(String clientId, Integer id);
+    Integer queryUserOrganId(String clientId, Integer userId);
 }

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

@@ -162,4 +162,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		return null;
 	}
 
+	@Override
+	public Integer queryUserOrganId(String clientId, Integer userId) {
+		if(StringUtils.equalsIgnoreCase(clientId,"SYSTEM")){
+			return sysUserDao.getEmployeeOrganId(userId);
+		}else if(StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
+			return sysUserDao.getTeacherOrganId(userId);
+		}
+		return null;
+	}
+
 }

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

@@ -24,7 +24,11 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysRole">
-		SELECT * FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} ORDER BY upate_time_ DESC
+		SELECT * FROM sys_role WHERE del_flag_ = 0
+        <if test="tenantId != null and tenantId != 0">
+            AND tenant_id_ = #{tenantId}
+        </if>
+		ORDER BY upate_time_ DESC
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -65,13 +69,20 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysRole" parameterType="map">
-        SELECT * FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} ORDER BY update_time_ DESC
+        SELECT * FROM sys_role WHERE del_flag_ = 0
+        <if test="tenantId != null and tenantId != 0">
+            AND tenant_id_ = #{tenantId}
+        </if>
+        ORDER BY update_time_ DESC
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId}
+		SELECT COUNT(*) FROM sys_role WHERE del_flag_ = 0
+        <if test="tenantId != null and tenantId != 0">
+            AND tenant_id_ = #{tenantId}
+        </if>
 	</select>
 
     <select id="findRoleByUserId" resultMap="SysRole">

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

@@ -29,13 +29,12 @@
         <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"/>
+        <!--<result column="tenant_id_" property="tenantId"/>-->
     </resultMap>
 
     <!-- 查询条件 -->
     <sql id="queryCondition">
         <where>
-            tenant_id_ = #{tenantId}
             <if test="userStartDate != null">
                 AND create_time_ &gt;= #{createStartDate}
             </if>
@@ -55,7 +54,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUser">
-		SELECT * FROM sys_user WHERE tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT * FROM sys_user ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -63,9 +62,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_,tenant_id_)
+        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
         VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{tenantId})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -132,9 +131,6 @@
             <if test="isSuperAdmin != null">
                 is_super_admin_ = #{isSuperAdmin},
             </if>
-            <if test="tenantId != null">
-                tenant_id_ = #{tenantId},
-            </if>
         </set>
         WHERE id_ = #{id}
     </update>
@@ -194,5 +190,11 @@
     <select id="getTeacherTenantId" resultType="java.lang.Integer">
         SELECT t.tenant_id_ FROM teacher t WHERE t.user_id_ = #{userId} LIMIT 1
     </select>
+    <select id="getEmployeeOrganId" resultType="java.lang.Integer">
+        SELECT e.organ_id_ FROM employee e WHERE e.user_id_ = #{userId} LIMIT 1
+    </select>
+    <select id="getTeacherOrganId" resultType="java.lang.Integer">
+        SELECT t.organ_id_ FROM teacher t WHERE t.user_id_ = #{userId} LIMIT 1
+    </select>
 
 </mapper>

edu-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -29,7 +29,7 @@
 			<if test="type != null">
 				and type_ = #{type}
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				and tenant_id_ = #{tenantId}
 			</if>
 			<if test="status != null">
@@ -70,7 +70,7 @@
 			<if test="title != null">
 				title_ = #{title},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="updateTime != null">
@@ -154,7 +154,7 @@
 		<if test="search != null">
 			and title_ like '%' #{search} '%'
 		</if>
-		<if test="tenantId != null">
+		<if test="tenantId != null and tenantId != 0">
 			and tenant_id_ = #{tenantId}
 		</if>
 		<choose>
@@ -185,7 +185,7 @@
 		<if test="search != null">
 			and title_ like '%' #{search} '%'
 		</if>
-		<if test="tenantId != null">
+		<if test="tenantId != null and tenantId != 0">
 			and tenant_id_ = #{tenantId}
 		</if>
 		<choose>

edu-common/src/main/java/com/keao/edu/common/tenant/TenantContextHolder.java

@@ -1,6 +1,8 @@
 package com.keao.edu.common.tenant;
 
 
+import org.apache.commons.lang3.StringUtils;
+
 public class TenantContextHolder {
 	
 
@@ -15,6 +17,9 @@ public class TenantContextHolder {
 	 * @return
 	 */
 	public static String getTenantId() {
+		if (StringUtils.isEmpty(tenantContextHolder.get())){
+			return "0";
+		}
 		return tenantContextHolder.get();
 	}
 

edu-datasource/src/main/resources/config/mybatis/DatabaseSourceMapper.xml

@@ -49,7 +49,7 @@
 			<if test="id != null">
 				id_ = #{id},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="url != null">

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java

@@ -6,6 +6,7 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.EmployeeQueryInfo;
 import com.keao.edu.user.service.EmployeeService;
@@ -43,8 +44,9 @@ public class EmployeeController extends BaseController {
 	@ApiOperation("新增员工")
 	@PostMapping(value = "/add")
 	public HttpResponseResult add(@RequestBody Employee employee) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        employee.setOrganId(sysUser.getId());
+//        SysUser sysUser = sysUserFeignService.queryUserInfo();
+//        employee.setOrganId(sysUser.getId());
+		employee.setTenantId(TenantContextHolder.getTenantId());
 	    employeeService.add(employee);
 		return succeed();
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -189,5 +189,11 @@ public class ExamOrderController extends BaseController {
         return msg;
     }
 
+    @ApiOperation(value = "/关闭订单")
+    @PostMapping("/closeOrder")
+    public HttpResponseResult closeOrder(String orderNo){
+        return succeed(examRegistrationPaymentService.closeOrder(orderNo));
+    }
+
 
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/OrganizationController.java

@@ -6,6 +6,7 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.page.OrganizationQueryInfo;
 import com.keao.edu.user.service.OrganizationService;
@@ -51,6 +52,7 @@ public class OrganizationController extends BaseController {
 	@PostMapping(value = "add")
     @PreAuthorize("@pcs.hasPermissions('organization/add')")
 	public HttpResponseResult addConfig(@RequestBody Organization organization) {
+		organization.setTenantId(TenantContextHolder.getTenantId());
 		organizationService.add(organization);
 		return succeed();
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TeacherController.java

@@ -5,6 +5,7 @@ import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.entity.Teacher;
 import com.keao.edu.user.page.TeacherQueryInfo;
 import com.keao.edu.user.service.TeacherService;
@@ -44,6 +45,7 @@ public class TeacherController extends BaseController {
 	@PostMapping(value = "add")
     @PreAuthorize("@pcs.hasPermissions('teacher/add')")
 	public HttpResponseResult add(@RequestBody Teacher teacher) {
+		teacher.setTenantId(TenantContextHolder.getTenantId());
 		return succeed(teacherService.add(teacher));
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TenantInfoController.java

@@ -14,6 +14,7 @@ import com.keao.edu.user.service.TenantInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,7 +40,11 @@ public class TenantInfoController extends BaseController {
 	@GetMapping(value = "/query")
 	public HttpResponseResult<TenantInfo> query() {
 		String tenantId = TenantContextHolder.getTenantId();
-		return succeed(tenantInfoService.get(Integer.parseInt(tenantId)));
+		if(StringUtils.isNotEmpty(tenantId)){
+			return succeed(tenantInfoService.get(Integer.parseInt(tenantId)));
+		}else {
+			return succeed(new TenantInfo());
+		}
 	}
 
 	@ApiOperation("新增机构")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -60,4 +60,12 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      */
     void queryPaymentStatus() throws Exception;
 
+
+    /**
+     * 关闭支付中订单
+     * @param orderNo 订单编号
+     * @return
+     */
+    Boolean closeOrder(String orderNo);
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/EmployeeServiceImpl.java

@@ -42,15 +42,16 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Transactional(rollbackFor = Exception.class)
 	public void add(Employee employee) {
 		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
-		String tenantId = queryUserInfo.getTenantId();
-
+		Integer organId = employeeDao.get(queryUserInfo.getId()).getOrganId();
+//		String tenantId = queryUserInfo.getTenantId();
+		employee.setOrganId(organId);
 		SysUser sysUser = employee.getSysUser();
-		employee.setTenantId(tenantId);
+//		employee.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		if(user != null && user.getId() != null){
-			if(!user.getTenantId().equals(tenantId)){
-				throw new BizException("手机号已被占用");
-			}
+//			if(!user.getTenantId().equals(tenantId)){
+//				throw new BizException("手机号已被占用");
+//			}
 			if(StringUtils.isNotEmpty(user.getUserType()) && user.getUserType().contains("SYSTEM")){
 				throw new BizException("手机号已被占用");
 			}
@@ -87,7 +88,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			}
 			return;
 		}
-		sysUser.setTenantId(tenantId);
+//		sysUser.setTenantId(tenantId);
 		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 		sysUser.setUserType("SYSTEM");
 		sysUserDao.insert(sysUser);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -147,6 +147,21 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
         adaPayQuery();
     }
 
+    @Override
+    public Boolean closeOrder(String orderNo) {
+        ExamRegistrationPayment order = examRegistrationPaymentDao.getByOrderNo(orderNo);
+        if (!order.getTransStatus().equals(TransStatusEnum.ING)) {
+            throw new BizException("订单不是待支付状态,请重新报名");
+        }
+        Date nowDate = new Date();
+        order.setTransStatus(TransStatusEnum.CLOSE);
+        order.setUpdateTime(nowDate);
+        if (examRegistrationPaymentDao.update(order) <= 0) {
+            throw new BizException("订单关闭失败，请重试");
+        }
+        return true;
+    }
+
 
     private void yqPayQuery() throws Exception {
         List<ExamRegistrationPayment> orders = examRegistrationPaymentDao.getOrdersByStatus("ING", "YQPAY");

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -293,7 +293,6 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         }
         Date nowDate = new Date();
         order.setTransStatus(TransStatusEnum.CLOSE);
-        order.setCreateTime(nowDate);
         order.setUpdateTime(nowDate);
         examRegistrationPaymentService.update(order);
 
@@ -301,11 +300,12 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 
         order.setId(null);
         order.setTransNo(null);
+        order.setCreateTime(nowDate);
         order.setTransStatus(TransStatusEnum.ING);
         order.setOrderNo(orderNo);
         examRegistrationPaymentService.insert(order);
 
-        ExaminationBasic examinationBasic = examinationBasicDao.get(order.getExaminationBasicId().longValue());
+        ExaminationBasic examinationBasic = examinationBasicDao.get(order.getExaminationBasicId());
         if (examinationBasic == null || !examinationBasic.getStatus().equals(ExamStatusEnum.APPLYING)) {
             throw new BizException("项目不在报名中，请核对");
         }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -62,17 +62,17 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			}
 		}
 		SysUser sysUser = organ.getSysUser();
-		String tenantId = queryUserInfo.getTenantId();
-		organ.setTenantId(tenantId);
-		sysUser.setTenantId(tenantId);
+//		String tenantId = queryUserInfo.getTenantId();
+//		organ.setTenantId(tenantId);
+//		sysUser.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		organ.setParentOrganId(queryUserInfo.getId());
 		organ.setLevel(currentOrganization.getLevel() + 1);
 
 		if(user != null && user.getId() != null){
-			if(!user.getTenantId().equals(tenantId)){
-				throw new BizException("手机号已被占用");
-			}
+//			if(!user.getTenantId().equals(tenantId)){
+//				throw new BizException("手机号已被占用");
+//			}
 			if(StringUtils.isNotEmpty(user.getUserType()) && user.getUserType().contains("SYSTEM")){
 				throw new BizException("手机号已被占用");
 			}
@@ -108,6 +108,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				}
 				Employee employee = employeeDao.get(sysUser.getId());
 				employee.setDelFlag(false);
+				employee.setTenantId(organ.getTenantId());
 				employeeDao.update(employee);
 				organ.setDelFlag(YesOrNoEnum.NO);
 				organ.setId(organization.getId());
@@ -134,7 +135,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		Employee employee = new Employee();
 		employee.setOrganId(organ.getId());
 		employee.setUserId(sysUser.getId());
-		employee.setTenantId(tenantId);
+		employee.setTenantId(organ.getTenantId());
 		employeeDao.insert(employee);
 
 		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/StudentServiceImpl.java

@@ -75,9 +75,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             }
             return;
         }
-        Organization organization = organizationService.get(student.getOrganId());
+//        Organization organization = organizationService.get(student.getOrganId());
 //        student.setTenantId(organization.getTenantId());
-        sysUser.setTenantId(organization.getTenantId());
+//        sysUser.setTenantId(organization.getTenantId());
         sysUser.setUserType("STUDENT");
         sysUserDao.insert(sysUser);
         ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(), null));

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TeacherServiceImpl.java

@@ -46,17 +46,17 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int add(Teacher teacher) {
-		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
+//		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
 		SysUser sysUser = teacher.getSysUser();
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		Date date = new Date();
-		String tenantId = queryUserInfo.getTenantId();
-		teacher.setTenantId(tenantId);
-		sysUser.setTenantId(tenantId);
+//		String tenantId = queryUserInfo.getTenantId();
+//		teacher.setTenantId(tenantId);
+//		sysUser.setTenantId(tenantId);
 		if(user != null && user.getId() != null){
-			if(!user.getTenantId().equals(tenantId)){
-				throw new BizException("手机号已被占用");
-			}
+//			if(!user.getTenantId().equals(tenantId)){
+//				throw new BizException("手机号已被占用");
+//			}
 			Integer id = user.getId();
 			sysUser.setId(id);
 			Teacher teacher1 = teacherDao.get(id);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TenantInfoServiceImpl.java

@@ -62,7 +62,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		tenantInfoDao.insert(tenantInfo);
 
 		SysUser sysUser = new SysUser();
-		sysUser.setTenantId(tenantInfo.getId().toString());
+//		sysUser.setTenantId(tenantInfo.getId().toString());
 		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 		sysUser.setUserType("SYSTEM");
 		sysUser.setRealName(tenantInfo.getContactName());

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

@@ -88,7 +88,7 @@
             <if test="demissionDate != null">
                 demission_date_ = #{demissionDate},
             </if>
-            <if test="tenantId != null">
+			<if test="tenantId != null">
                 tenant_id_=#{tenantId},
             </if>
             <if test="organId != null">
@@ -106,13 +106,22 @@
 	</update>
 	<sql id="employeeQueryPage">
 		<where>
-				e.del_flag_ = 0 AND e.tenant_id_ = #{tenantId} AND e.user_id_ != #{userId}
+				e.del_flag_ = 0 AND e.user_id_ != #{userId}
 			<if test="search != null and search != ''">
 				AND (e.user_id_ = #{search} OR su.phone_ LIKE CONCAT('%',#{search},'%') OR su.real_name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="roleId != null">
 				AND sur.role_id_ = #{roleId}
 			</if>
+			<if test="tenantId != null and tenantId != 0">
+				AND e.tenant_id_ = #{tenantId}
+			</if>
+			<if test="organIds != null">
+				AND e.organ_id_ IN
+				<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+					#{organId}
+				</foreach>
+			</if>
 		</where>
 	</sql>
 	

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

@@ -69,7 +69,7 @@
 			<if test="examStartTime != null">
 				exam_start_time_ = #{examStartTime},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="cardNo != null">

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

@@ -76,13 +76,16 @@
 
 	<sql id="queryCondition">
 		<where>
-			del_flag_=0 AND tenant_id_ = #{tenantId}
+			del_flag_=0
 			<if test="isAvailable!=null">
 				AND is_available_=#{isAvailable}
 			</if>
 			<if test="search!=null">
 				AND (id_=#{search} OR name_ LIKE CONCAT('%', #{serch}, '%'))
 			</if>
+			<if test="tenantId != null and tenantId != 0">
+				AND tenant_id_ = #{tenantId}
+			</if>
 		</where>
 	</sql>
 	

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

@@ -55,7 +55,7 @@
 			<if test="fee != null">
 				fee_ = #{fee},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="level != null">

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

@@ -81,7 +81,7 @@
 			<if test="url != null">
 				url_ = #{url},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="shareProfitAmount != null">
@@ -166,14 +166,16 @@
 
 	<sql id="queryCondition">
 		<where>
-			ear.tenant_id_=#{tenantId}
-			AND ear.examination_basic_id_=#{examId}
+			ear.examination_basic_id_=#{examId}
 			<if test="organIds!=null">
 				AND ear.organ_id_ IN
 				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
 					#{organId}
 				</foreach>
 			</if>
+			<if test="tenantId != null and tenantId != 0">
+				AND ear.tenant_id_ = #{tenantId}
+			</if>
 			<if test="settlementType!=null">
 				AND ear.settlement_type_=#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
@@ -269,9 +271,11 @@
 
 	<sql id="queryUnRelatedOrgansCondition">
 		<where>
-			o.tenant_id_ = #{tenantId}
+			<if test="tenantId != null and tenantId != 0">
+				AND o.tenant_id_ = #{tenantId}
+			</if>
 			<if test="organIds!=null">
-				o.id_ IN
+				AND o.id_ IN
 				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
 					#{organId}
 				</foreach>

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

@@ -69,35 +69,47 @@
 			<if test="examinationBasicId != null">
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
+			<if test="studentId != null != null">
+				student_id_ = #{studentId},
+			</if>
+			<if test="organId != null">
+				organ_id_ = #{organId},
+			</if>
 			<if test="subjectId != null">
 				subject_id_ = #{subjectId},
 			</if>
-			<if test="adviserPhone != null">
-				adviser_phone_ = #{adviserPhone},
+			<if test="level != null">
+				level_ = #{level},
+			</if>
+			<if test="levelFee != null">
+				level_fee_ = #{levelFee},
+			</if>
+			<if test="songJson != null">
+				song_json_ = #{songJson},
 			</if>
 			<if test="lastExamLevel != null">
 				last_exam_level_ = #{lastExamLevel},
 			</if>
-			<if test="tenantId != null">
-				tenant_id_ = #{tenantId},
+			<if test="lastExamCertificateUrl != null">
+				last_exam_certificate_url_ = #{lastExamCertificateUrl},
 			</if>
-			<if test="level != null">
-				level_ = #{level},
+			<if test="examMusicTheoryLevel!= null">
+				exam_music_theory_level_ = #{examMusicTheoryLevel},
 			</if>
-			<if test="organId != null">
-				organ_id_ = #{organId},
+			<if test="theoryLevelFee!= null">
+				theory_level_fee_ = #{theoryLevelFee},
 			</if>
-			<if test="songJson != null">
-				song_json_ = #{songJson},
+			<if test="lastMusicTheoryLevel != null">
+				last_music_theory_level_ = #{lastMusicTheoryLevel},
+			</if>
+			<if test="lastMusicTheoryCertificateUrl != null">
+				last_music_theory_certificate_url_ = #{lastMusicTheoryCertificateUrl},
 			</if>
 			<if test="adviserName != null">
 				adviser_name_ = #{adviserName},
 			</if>
-			<if test="studentId != null">
-				student_id_ = #{studentId},
-			</if>
-			<if test="lastExamCertificateUrl != null">
-				last_exam_certificate_url_ = #{lastExamCertificateUrl},
+			<if test="adviserPhone != null">
+				adviser_phone_ = #{adviserPhone},
 			</if>
 			<if test="cardNo!=null">
 				card_no_ =#{cardNo},
@@ -105,11 +117,18 @@
 			<if test="status!=null">
 				status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
 			<if test="memo!=null">
 				memo_ = #{memo},
 			</if>
-				update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+			update_time_ = NOW()
+		</set>
+		WHERE id_ = #{id}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -359,7 +378,7 @@
 			<if test="examRegistrationId != null">
 				er.id_ = #{examRegistrationId}
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				er.tenant_id_ = #{tenantId}
 			</if>
 			<if test="status != null and status != ''">

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

@@ -65,7 +65,7 @@
             <if test="id != null">
                 id_ = #{id},
             </if>
-            <if test="tenantId != null">
+            <if test="tenantId != null and tenantId != 0">
                 tenant_id_ = #{tenantId},
             </if>
             <if test="examRegistrationId != null">

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

@@ -60,7 +60,7 @@
 			<if test="evaluationResult != null">
 				evaluation_result_ = #{evaluationResult},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="studentId != null">

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

@@ -87,7 +87,7 @@
 			<if test="subjectNameList != null">
 				subject_name_list_ = #{subjectNameList},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="examMode != null">
@@ -142,7 +142,7 @@
 			<if test="subjectNameList != null">
 				subject_name_list_ = #{subjectNameList},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="examMode != null">
@@ -212,7 +212,7 @@
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = #{examId}
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				AND er.tenant_id_ = #{tenantId}
 			</if>
 			<if test="startTime != null">

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

@@ -61,7 +61,7 @@
 			<if test="classroomSwitch != null">
 				classroom_switch_ = #{classroomSwitch,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="examRoomId != null">

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

@@ -75,7 +75,10 @@
 
 	<sql id="queryCondition">
 		<where>
-			es.del_flag_=0 AND es.tenant_id_ = #{tenantId}
+			es.del_flag_ = 0
+			<if test="tenantId != null and tenantId != 0">
+				AND es.tenant_id_ = #{tenantId}
+			</if>
 			<if test="subjectList!=null">
 				AND FIND_IN_SET(#{subjectList}, es.subject_list_)
 			</if>

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

@@ -51,7 +51,7 @@
 			<if test="id != null">
 				id_ = #{id},
 			</if>
-			<if test="tenantId != null">
+		<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			update_time_ = NOW()

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

@@ -70,7 +70,7 @@
 			<if test="practiceNum != null">
 			practice_num_ = #{practiceNum},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 			tenant_id_ = #{tenantId},
 			</if>
 			<if test="examSubjectId != null">

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

@@ -65,7 +65,7 @@
 			<if test="teacherId != null">
 				teacher_id_ = #{teacherId},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="examMode != null">

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

@@ -26,7 +26,10 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicTheory">
-		SELECT <include refid="Base_Column_List"/> FROM music_theory WHERE tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT <include refid="Base_Column_List"/>
+		FROM music_theory
+		<include refid="queryCondition"/>
+		ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -65,13 +68,9 @@
 
 	<sql id="queryCondition">
 		<where>
-			1=1 AND tenant_id_ = #{tenantId}
-			<!--<if test="subjectList!=null">-->
-				<!--AND FIND_IN_SET(#{subjectList}, subject_list_)-->
-			<!--</if>-->
-			<!--<if test="search!=null">-->
-				<!--AND (id_=#{search} OR song_name_ LIKE CONCAT('%', #{search}, '%'))-->
-			<!--</if>-->
+			<if test="tenantId != null and tenantId != 0">
+				tenant_id_ = #{tenantId}
+			</if>
 		</where>
 	</sql>
 

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

@@ -85,7 +85,7 @@
 			<if test="delFlag != null">
 				del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="userId != null">
@@ -102,10 +102,19 @@
 
 	<sql id="organQueryPage">
 		<where>
-			del_flag_ = 0 AND tenant_id_ = #{tenantId}
+			del_flag_ = 0
 			<if test="settlementType != null and settlementType != ''">
 				AND settlement_type_ = #{settlementType}
 			</if>
+			<if test="tenantId != null and tenantId != 0">
+				AND tenant_id_ = #{tenantId}
+			</if>
+			<if test="organIds != null">
+				AND id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 			<if test="isAllowArrangeExam != null">
 				AND is_allow_arrange_exam_ = #{isAllowArrangeExam}
 			</if>

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

@@ -65,7 +65,7 @@
 			<if test="operatorId != null">
 				operator_id_ = #{operatorId},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="confirmStatus != null">

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

@@ -11,7 +11,6 @@
 		<result column="certificate_photo_" property="certificatePhoto" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="tenant_id_" property="tenantId" />
 		<result column="organ_id_" property="organId" />
 		<association property="sysUser" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
@@ -40,7 +39,7 @@
 			<if test="certificatePhoto != null">
 				certificate_photo_ = #{certificatePhoto},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="organId != null">
@@ -56,7 +55,9 @@
 
 	<sql id="queryCondition">
 		<where>
-			stu.tenant_id_ = #{tenantId}
+			<if test="tenantId != null and tenantId != 0">
+				AND stu.tenant_id_ = #{tenantId}
+			</if>
 			<if test="search != null and search != ''">
 				AND (stu.user_id_ = #{search} OR su.real_name_ LIKE CONCAT (#{search}, '%'))
 			</if>
@@ -101,7 +102,7 @@
 			<if test="studentId != null">
 				AND er.student_id_ = #{studentId}
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				AND er.tenant_id_ = #{tenantId}
 			</if>
 		</where>

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

@@ -85,7 +85,7 @@
 	</select>
 
     <select id="findByParentId" resultMap="Subject">
-        SELECT * FROM subject <include refid="querySubPageSql"/>
+        SELECT * FROM subject s <include refid="querySubPageSql"/>
     </select>
 
     <select id="findBySubIds" resultType="string">
@@ -93,29 +93,30 @@
     </select>
 
     <select id="queryNameByIds" resultType="java.util.Map">
-        select id_ `key`,name_ `value` FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIds}) AND s.del_flag_ = 0 AND tenant_id_ = #{tenantId}
+        select id_ `key`,name_ `value` FROM `subject` s
+        WHERE FIND_IN_SET(s.id_,#{subjectIds}) AND s.del_flag_ = 0
+        AND tenant_id_ = #{tenantId}
     </select>
 
     <select id="findSubSubjects" resultMap="Subject">
         SELECT * FROM `subject`
         WHERE parent_subject_id_ != 0 AND del_flag_ = 0
-        <if test="tenantId != null">
+        <if test="tenantId != null and tenantId != 0">
             AND tenant_id_ = #{tenantId}
         </if>
     </select>
 
     <sql id="querySubPageSql">
         <where>
-            s.tenant_id_ = #{tenantId}
+            <if test="tenantId != null and tenantId != 0">
+                AND s.tenant_id_ = #{tenantId}
+            </if>
             <if test="parentId != null">
                 AND s.parent_subject_id_ = #{parentId}
             </if>
             <if test="parentId == null">
                 AND s.parent_subject_id_ != 0
             </if>
-            <if test="tenantId != null">
-                AND s.tenant_id_ = #{tenantId}
-            </if>
             <if test="delFlag != null">
                 AND s.del_flag_ = #{delFlag}
             </if>

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

@@ -61,7 +61,7 @@
 			<if test="group != null">
 				group_ = #{group},
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId != 0">
 				tenant_id_ = #{tenantId},
 			</if>
 		</set>
@@ -73,15 +73,26 @@
 		DELETE FROM sys_config WHERE id_ = #{id}
 	</delete>
 
+	<sql id="queryPageSql">
+		<where>
+			<if test="tenantId != null and tenantId != 0">
+				tenant_id_ = #{tenantId}
+			</if>
+		</where>
+	</sql>
+
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysConfig" parameterType="map">
-		SELECT * FROM sys_config WHERE tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT * FROM sys_config
+		<include refid="queryPageSql"/>
+		ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_config WHERE tenant_id_ = #{tenantId}
+		SELECT COUNT(*) FROM sys_config
+		<include refid="queryPageSql"/>
 	</select>
 	
 	<select id="findByParamName" resultMap="SysConfig">

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

@@ -29,7 +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"/>
+        <!--<result column="tenant_id_" property="tenantId"/>-->
         <!--<collection property="roles" ofType="java.lang.Integer" column="role_id_"/>-->
     </resultMap>
 
@@ -46,7 +46,6 @@
 
     <!-- 查询条件 -->
     <sql id="queryCondition">
-        tenant_id_ = #{tenantId}
         <if test="userStartDate != null">
             and create_time_ &gt;= #{createStartDate}
         </if>
@@ -65,7 +64,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUser">
-		SELECT * FROM sys_user WHERE tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT * FROM sys_user ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -73,9 +72,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_,tenant_id_)
+        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
         VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{tenantId})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -84,12 +84,21 @@
 	</update>
 	<sql id="teacherQueryPage">
 		<where>
-			t.del_flag_ = 0 AND FIND_IN_SET(#{tenantId},t.tenant_id_)
+			t.del_flag_ = 0
 			<if test="search != null and search != ''">
 				AND (t.user_id_ = #{search}
 				OR su.real_name_ LIKE CONCAT('%',#{search},'%')
 				OR su.phone_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+			<if test="tenantId != null and tenantId != 0">
+				AND t.tenant_id_ = #{tenantId}
+			</if>
+			<if test="organIds != null">
+				AND t.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 			<if test="settlementType != null and settlementType != ''">
 				AND t.salary_settlement_type_ = #{settlementType}
 			</if>

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

@@ -25,7 +25,7 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="TenantInfo" >
-		SELECT * FROM tenant_info WHERE id_ = #{id} 
+		SELECT * FROM tenant_info WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->