Merge remote-tracking branch 'origin/master'

edu-common/src/main/java/com/keao/edu/common/page/QueryInfo.java

@@ -7,9 +7,12 @@
  */
 package com.keao.edu.common.page;
 
+import com.keao.edu.common.tenant.OrganContextHolder;
 import com.keao.edu.common.tenant.TenantContextHolder;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
+
 /**
  * 查询对象基类
  */
@@ -31,10 +34,30 @@ public class QueryInfo {
 	 */
 	private String order = "desc";
 
-	private String tenantId= (String) TenantContextHolder.getTenantId();
+	private String tenantId= TenantContextHolder.getTenantId();
+
+	private Integer organId= OrganContextHolder.getOrganId();
+
+	private List<Integer> organIds;
 	
 	private String search;
 
+	public List<Integer> getOrganIds() {
+		return organIds;
+	}
+
+	public void setOrganIds(List<Integer> organIds) {
+		this.organIds = organIds;
+	}
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
 	public String getTenantId() {
 		return tenantId;
 	}

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

@@ -0,0 +1,28 @@
+package com.keao.edu.common.tenant;
+
+
+public class OrganContextHolder {
+	
+
+	private static final ThreadLocal<Integer> organContextHolder = new ThreadLocal<Integer>();
+
+	public static void setOrganId(Integer organId) {
+		organContextHolder.set(organId);
+	}
+
+	/**
+	 * 获取数据源
+	 * @return
+	 */
+	public static Integer getOrganId() {
+		return organContextHolder.get();
+	}
+
+	/**
+	 * 重置数据源
+	 */
+	public static void clearOrganId() {
+		organContextHolder.remove();
+	}
+
+}

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

@@ -1,14 +1,15 @@
 package com.keao.edu.common.tenant;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
 	private static final String TENANT_ID = "tenantId";
+	private static final String ORGAN_ID = "organId";
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -17,7 +18,13 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 			tenantId = request.getParameter(TENANT_ID);
 		}
 		TenantContextHolder.setTenantId(tenantId);
-
+		String organId = request.getHeader(ORGAN_ID);
+		if (StringUtils.isEmpty(organId)) {
+			organId = request.getParameter(ORGAN_ID);
+		}
+		if(StringUtils.isNotEmpty(organId)){
+			OrganContextHolder.setOrganId(Integer.parseInt(organId));
+		}
 		return true;
 	}
 

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

@@ -10,6 +10,7 @@ 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;
+import com.keao.edu.user.service.OrganizationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -25,12 +26,17 @@ public class EmployeeController extends BaseController {
 	private EmployeeService employeeService;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private OrganizationService organizationService;
 	
 	@ApiOperation("员工服务分页查询")
 	@GetMapping(value = "/list")
 	public HttpResponseResult<PageInfo<Employee>> getList(EmployeeQueryInfo queryInfo) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		queryInfo.setUserId(sysUser.getId());
+		if(queryInfo.getOrganId() != null){
+			queryInfo.setOrganIds(organizationService.getChildOrganIds(queryInfo.getOrganId(),true));
+		}
 		return succeed(employeeService.queryPage(queryInfo));
 	}
 

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

@@ -145,7 +145,7 @@ public class ExamOrderController extends BaseController {
     }
 
 
-    @ApiOperation(value = "/获取订单状态及订单信息")
+    @ApiOperation(value = "获取订单状态及订单信息")
     @GetMapping(value = "/paymentResult")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderNo", value = "订单编号", required = true, dataType = "String")})
@@ -189,7 +189,7 @@ public class ExamOrderController extends BaseController {
         return msg;
     }
 
-    @ApiOperation(value = "/关闭订单")
+    @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/ExamRegistrationController.java

@@ -10,12 +10,11 @@ import com.keao.edu.user.dto.ExamRecordDto;
 import com.keao.edu.user.dto.ExamRegistrationDto;
 import com.keao.edu.user.dto.ExamRegistrationRoomDto;
 import com.keao.edu.user.dto.ExamRegistrationStatisticsDto;
-import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.page.ExamRecordQueryInfo;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamRegistrationService;
+import com.keao.edu.user.service.OrganizationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.Objects;
 
 /**
  * @Author Joburgess
@@ -42,20 +40,23 @@ public class ExamRegistrationController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
-    private EmployeeService employeeService;
+    private OrganizationService organizationService;
 
     @ApiOperation(value = "学员报名记录查询")
     @GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('examRegistration/list')")
     public HttpResponseResult<PageInfo<ExamRegistrationRoomDto>> list(ExamRegistrationQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        /*SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
             Employee employee = employeeService.get(sysUser.getId());
             if(Objects.isNull(employee)){
                 return failed("用户信息异常");
             }
             queryInfo.setOrganId(employee.getOrganId());
-        }
+        }*/
+//        if(queryInfo.getOrganId() != null){
+//            queryInfo.setOrganIds(organizationService.getChildOrganIds(queryInfo.getOrganId(),true));
+//        }
         return succeed(examRegistrationService.queryExamRegistrationStudents(queryInfo));
     }
 

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

@@ -37,6 +37,9 @@ public class OrganizationController extends BaseController {
 	public HttpResponseResult<PageInfo<Organization>> configList(OrganizationQueryInfo queryInfo) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		queryInfo.setParentId(sysUser.getId());
+		if(queryInfo.getOrganId() != null){
+			queryInfo.setOrganIds(organizationService.getChildOrganIds(queryInfo.getOrganId(),false));
+		}
 		return succeed(organizationService.queryPage(queryInfo));
 	}
 
@@ -77,6 +80,7 @@ public class OrganizationController extends BaseController {
 	@PreAuthorize("@pcs.hasPermissions('organization/getChildOrgans')")
 	public HttpResponseResult<List<Organization>> getChildOrgans(){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		return succeed(organizationService.getChildOrgans(sysUser.getId()));
+		Organization organization = organizationService.findByUserId(sysUser.getId());
+		return succeed(organizationService.getChildOrgans(organization.getId()));
 	}
 }

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

@@ -8,6 +8,7 @@ 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.OrganizationService;
 import com.keao.edu.user.service.TeacherService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,11 +26,16 @@ public class TeacherController extends BaseController {
 
 	@Autowired
 	private TeacherService teacherService;
+	@Autowired
+	private OrganizationService organizationService;
 
 	@ApiOperation(value = "教师列表")
 	@GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('teacher/list')")
 	public HttpResponseResult<PageInfo<Teacher>> list(TeacherQueryInfo queryInfo) {
+		if(queryInfo.getOrganId() != null){
+			queryInfo.setOrganIds(organizationService.getChildOrganIds(queryInfo.getOrganId(),true));
+		}
 		return succeed(teacherService.queryTeacherPage(queryInfo));
 	}
 

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

@@ -57,9 +57,8 @@ public class TenantInfoController extends BaseController {
 	@ApiOperation("更新机构")
 	@PostMapping(value = "/update")
 	public HttpResponseResult update(@RequestBody TenantInfoDto tenantInfo) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(!sysUser.getIsSuperAdmin()){
-			String tenantId = TenantContextHolder.getTenantId();
+		String tenantId = TenantContextHolder.getTenantId();
+		if(StringUtils.isNotEmpty(tenantId)){
 			tenantInfo.setId(Integer.parseInt(tenantId));
 		}
 		tenantInfo.setUpdateTime(new Date());

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/OrganizationDao.java

@@ -53,4 +53,6 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
      * @return java.util.List<com.keao.edu.user.entity.Organization>
      */
     List<Organization> getOrgans(@Param("organIds") List<Integer> organIds);
+
+    Organization findByUserId(Integer userId);
 }

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

@@ -47,11 +47,23 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	void delEmployeeRole(Integer userId);
 
 	/**
+	 * 删除用户角色
+	 * @param userIds
+	 */
+	void batchDelEmployeeRole(@Param("userIds") List<Integer> userIds);
+
+	/**
 	 * 批量新增用户角色
 	 * @param id
 	 * @param roles
 	 */
 	void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roles") Set<Integer> roles);
+	/**
+	 * 批量新增用户角色
+	 * @param userIds
+	 * @param roles
+	 */
+	void batchAddEmployeeRoles(@Param("userIds") List<Integer> userIds, @Param("roles") Set<Integer> roles);
 
 	/**
 	 * 获取用户角色列表

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

@@ -1,10 +1,8 @@
 package com.keao.edu.user.service;
 
 
-import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.entity.Organization;
-import com.keao.edu.user.page.OrganizationQueryInfo;
 
 import java.util.List;
 
@@ -58,4 +56,6 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     void del(Integer id);
 
     Organization getOrganization(Integer id);
+
+    Organization findByUserId(Integer id);
 }

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

@@ -10,8 +10,10 @@ 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 com.keao.edu.user.dao.EmployeeDao;
+import com.keao.edu.user.dao.OrganizationDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.entity.Employee;
+import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.service.EmployeeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +21,9 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> implements EmployeeService {
@@ -27,6 +31,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Autowired
 	private EmployeeDao employeeDao;
 	@Autowired
+	private OrganizationDao organizationDao;
+	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
 	private SysUserDao sysUserDao;
@@ -118,10 +124,21 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			}
 		}
 		employeeDao.update(employee);
-		//删除当前用户角色
-		sysUserDao.delEmployeeRole(sysUser.getId());
-		//新增用户角色
-		sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+
+		Organization organization = organizationDao.findByUserId(employee.getUserId());
+		if(organization != null){
+			List<Organization> childOrgans = organizationDao.getChildOrgans(organization.getParentOrganIdTag());
+			childOrgans.add(organization);
+			List<Integer> userIds = childOrgans.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+
+			sysUserDao.batchDelEmployeeRole(userIds);
+			if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+				sysUserDao.batchAddEmployeeRoles(userIds,sysUser.getRoles());
+			}
+		}else {
+			sysUserDao.delEmployeeRole(sysUser.getId());
+			sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+		}
 		sysUserDao.update(sysUser);
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName(),sysUser.getAvatar()));
 	}

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

@@ -22,11 +22,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organization> implements OrganizationService {
@@ -161,13 +163,18 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		}
 		sysUser.setRealName(organization.getName());
 		sysUser.setPhone(organization.getContactPhone());
+		organization.setUserId(organization1.getUserId());
 		organDao.update(organization);
-		//删除当前用户角色
-		sysUserDao.delEmployeeRole(sysUser.getId());
-		//新增用户角色
+
+		List<Organization> childOrgans = organDao.getChildOrgans(organization.getParentOrganIdTag());
+		childOrgans.add(organization);
+		List<Integer> userIds = childOrgans.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+
+		sysUserDao.batchDelEmployeeRole(userIds);
 		if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
-			sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+			sysUserDao.batchAddEmployeeRoles(userIds,sysUser.getRoles());
 		}
+
 		sysUserDao.update(sysUser);
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName(),sysUser.getAvatar()));
 	}
@@ -188,6 +195,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		if(!includeSelf){
 			selfAndChildOrganIds.remove(organization.getId());
 		}
+		if(CollectionUtils.isEmpty(selfAndChildOrganIds)){
+			return null;
+		}
 		return selfAndChildOrganIds;
 	}
 
@@ -195,7 +205,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	public List<Organization> getChildOrgans(Integer organId) {
 		Organization organization = organDao.get(organId);
 		if(Objects.isNull(organization)){
-			throw new BizException("当前声部不存在");
+			throw new BizException("合作单位不存在");
 		}
 		List<Organization> selfAndChildOrgans = organDao.getChildOrgans(organization.getParentOrganIdTag());
 		if(null == selfAndChildOrgans){
@@ -259,4 +269,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUser.setRoles(roleIds);
 		return organization;
 	}
+
+	@Override
+	public Organization findByUserId(Integer userId) {
+		return organDao.findByUserId(userId);
+	}
 }

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

@@ -14,9 +14,7 @@ import com.keao.edu.user.dao.StudentDao;
 import com.keao.edu.user.dao.StudentExamResultDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
-import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.page.StudentApplyQueryInfo;
-import com.keao.edu.user.service.OrganizationService;
 import com.keao.edu.user.service.StudentService;
 import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -44,8 +42,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Autowired
     private StudentExamResultDao studentExamResultDao;
     @Autowired
-    private OrganizationService organizationService;
-    @Autowired
     private ImFeignService imFeignService;
 
     @Override

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

@@ -138,12 +138,6 @@
 
 	<sql id="queryCondition">
 		<where>
-			<if test="organIds!=null">
-				AND er.organ_id_ IN
-				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-					#{organId}
-				</foreach>
-			</if>
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = #{examId}
 			</if>
@@ -414,7 +408,7 @@
 	<!-- 获取报名信息 -->
 	<select id="getExamRegistration" resultMap="ExamRegistrationDtoMap">
 		SELECT er.*,s.name_ subjectName,su.real_name_ studentName,eb.expect_exam_start_time_,eb.expect_exam_end_time_ FROM exam_registration er
-		LEFT JOIN sys_user su ON su.id_ = er.subject_id_
+		LEFT JOIN sys_user su ON su.id_ = er.student_id_
 		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
 		LEFT JOIN subject s on er.subject_id_ = s.id_
 		WHERE er.id_ = #{examRegistrationId}

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

@@ -126,7 +126,7 @@
                 AND ec.card_no_=#{cardNo}
             </if>
             <if test="examName!=null">
-                AND ec.card_no_=#{cardNo}
+                AND eb.name_=#{examName}
             </if>
             <if test="organIds!=null">
                 AND erp.organ_id_ IN

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

@@ -109,6 +109,9 @@
 			<if test="tenantId != null and tenantId != 0">
 				AND tenant_id_ = #{tenantId}
 			</if>
+			<if test="organId != null">
+				AND id_ != #{organId}
+			</if>
 			<if test="organIds != null">
 				AND id_ IN
 				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -160,4 +163,10 @@
 			#{organId}
 		</foreach>
 	</select>
+	<select id="findByUserId" resultMap="Organization" >
+		SELECT <include refid="organizationColumn"/>,su.*
+		FROM organization o
+		LEFT JOIN sys_user su ON o.user_id_ = su.id_
+		WHERE o.user_id_ = #{userId} LIMIT 1
+	</select>
 </mapper>

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

@@ -28,8 +28,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.api.entity.Student" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO student (user_id_,certificate_photo_,create_time_,update_time_,tenant_id_,organ_id_)
-		VALUES(#{userId},#{certificatePhoto},NOW(),NOW(),#{tenantId},#{organId})
+		INSERT INTO student (user_id_,certificate_photo_,create_time_,update_time_,organ_id_)
+		VALUES(#{userId},#{certificatePhoto},NOW(),NOW(),#{organId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -39,9 +39,6 @@
 			<if test="certificatePhoto != null">
 				certificate_photo_ = #{certificatePhoto},
 			</if>
-			<if test="tenantId != null and tenantId != 0">
-				tenant_id_ = #{tenantId},
-			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>

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

@@ -198,9 +198,23 @@
             (#{userId},#{item})
         </foreach>
     </insert>
+    <insert id="batchAddEmployeeRoles">
+        <foreach collection="userIds" item="userId" separator=";">
+            INSERT INTO sys_user_role(user_id_,role_id_) values
+            <foreach collection="roles" item="item" index="index" separator=",">
+                (#{userId},#{item})
+            </foreach>
+        </foreach>
+    </insert>
 
     <delete id="delEmployeeRole">
         DELETE FROM sys_user_role WHERE user_id_ = #{userId}
     </delete>
+    <delete id="batchDelEmployeeRole">
+        DELETE FROM sys_user_role WHERE user_id_ IN
+        <foreach collection="userIds" item="userId" separator="," open="(" close=")">
+            #{userId}
+        </foreach>
+    </delete>
 
 </mapper>