修改user表的organId为字符串

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -46,7 +46,7 @@ public class SysUser implements Serializable{
 
 	/** 部门ID */
 	@ApiModelProperty(value = "部门ID",required = false)
-	private Integer organId;
+	private String organId;
 
 	/** 部门ID */
 	@ApiModelProperty(value = "部门名称",required = false)
@@ -199,11 +199,11 @@ public class SysUser implements Serializable{
 		return this.avatar;
 	}
 
-	public Integer getOrganId() {
+	public String getOrganId() {
 		return organId;
 	}
 
-	public void setOrganId(Integer organId) {
+	public void setOrganId(String organId) {
 		this.organId = organId;
 	}
 

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

@@ -51,7 +51,7 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param organId
 	 * @return
 	 */
-    String getOrganName(Integer organId);
+    String getOrganName(String organId);
 
 	/**
 	 * 获取随机盐不为null的一条数据

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

@@ -189,7 +189,7 @@
         select * from sys_user where lock_flag_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
     <select id="getOrganName" resultType="java.lang.String">
-        SELECT name_ FROM organization WHERE id_ = #{organId}
+        SELECT GROUP_CONCAT(name_) FROM organization WHERE FIND_IN_SET(id_,#{organId})
     </select>
     <select id="findUserBySalt" resultMap="SysUser">
         SELECT * FROM sys_user WHERE salt_ IS NOT NULL AND salt_ != '' AND user_type_ = #{userType} LIMIT 1

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CooperationOrganDao.java

@@ -17,7 +17,7 @@ public interface CooperationOrganDao extends BaseDAO<Integer, CooperationOrgan>
      * @param organId
      * @return
      */
-    List<CooperationOrgan> queryByOrganId(@Param("organId") Integer organId);
+    List<CooperationOrgan> queryByOrganId(@Param("organId") String organId);
 
     /**
      * 根据合作机构编号列表获取合作机构名称

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -72,7 +72,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<Teacher> findTeachers(@Param("organId") Integer organId);
+    List<Teacher> findTeachers(@Param("organId") String organId);
 
     /**
      * count上课结算列表

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupActivityQueryInfo.java

@@ -8,13 +8,13 @@ import com.ym.mec.common.page.QueryInfo;
  */
 public class VipGroupActivityQueryInfo extends QueryInfo {
 
-    private Integer organId;
+    private String organId;
 
-    public Integer getOrganId() {
+    public String getOrganId() {
         return organId;
     }
 
-    public void setOrganId(Integer organId) {
+    public void setOrganId(String organId) {
         this.organId = organId;
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/CooperationOrganService.java

@@ -12,5 +12,5 @@ public interface CooperationOrganService extends BaseService<Integer, Cooperatio
      * @param organId
      * @return
      */
-    List<CooperationOrgan> queryByOrganId(Integer organId);
+    List<CooperationOrgan> queryByOrganId(String organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherService.java

@@ -75,7 +75,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<Teacher> findTeachers(@Param("organId") Integer organId);
+    List<Teacher> findTeachers(@Param("organId") String organId);
 
     /**
      * @describe 根据科目获取部门下的教师

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CooperationOrganServiceImpl.java

@@ -23,7 +23,7 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 	}
 
 	@Override
-	public List<CooperationOrgan> queryByOrganId(Integer organId) {
+	public List<CooperationOrgan> queryByOrganId(String organId) {
 		return cooperationOrganDao.queryByOrganId(organId);
 	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -231,7 +231,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(null==user){
 			throw new BizException("请登录");
 		}
-		return courseScheduleDao.getCourseScheduleDate(month,user.getOrganId().longValue());
+		return courseScheduleDao.getCourseScheduleDate(month,Long.parseLong(user.getOrganId()));
 	}
 
 	@Override
@@ -279,7 +279,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(null==user){
 			throw new BizException("请登录");
 		}
-		queryInfo.setOrganId(user.getOrganId().longValue());
+		queryInfo.setOrganId(Long.parseLong(user.getOrganId()));
 		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 
 		if(Objects.isNull(queryInfo.getDate())){

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -64,6 +64,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		if(user != null && user.getId() != null){
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
+				employee.setOrganId(employee.getOrganIdList());
 				employee.setUserId(user.getId());
 				employeeDao.insert(employee);
 				//新增用户角色
@@ -110,6 +111,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employeeDao.delEmployeeRole(employee.getId());
 		//新增用户角色
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
+		employee.setOrganId(employee.getOrganIdList());
 		teacherDao.updateUser(employee);
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -185,7 +185,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             sysUser.setDelFlag(com.ym.mec.auth.api.enums.YesOrNoEnum.NO);
             sysUser.setUserType(SysUserType.STUDENT);
             sysUser.setGender(studentRegistration.getGender());
-            sysUser.setOrganId(studentRegistration.getOrganId());
+            if(studentRegistration.getOrganId() != null){
+                sysUser.setOrganId(studentRegistration.getOrganId().toString());
+            }
             sysUser.setRealName(studentRegistration.getParentsName());
             sysUser.setUsername(studentRegistration.getName());
             sysUser.setIdCardNo(studentRegistration.getIdCardNo());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -200,7 +200,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
     @Override
-    public List<Teacher> findTeachers(Integer organId) {
+    public List<Teacher> findTeachers(String organId) {
 		return teacherDao.findTeachers(organId);
     }
 
@@ -361,7 +361,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			if(StringUtils.isNotEmpty(teacher.getFlowOrganRange())){
 				teacher.setFlowOrganRangeId(teacher.getFlowOrganRange());
 				List<String> organNames = organizationDao.findByOrganIds(teacher.getFlowOrganRange());
-				teacher.setOrganName(organizationDao.get(teacher.getOrganId()).getName());
+				teacher.setOrganName(organizationDao.get(Integer.parseInt(teacher.getOrganId())).getName());
 				teacher.setFlowOrganRange(StringUtils.join(organNames,","));
 			}
 			//专业技能

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -172,7 +172,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(sysUser.getOrganId().longValue(), totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(Long.parseLong(sysUser.getOrganId()), totalClassTimes);
 			int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
 			if(month>vipGroupDefaultClassesCycle.getMonth()){
 				throw new BizException("课时安排时间超出范围!");
@@ -233,7 +233,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}else{
 			vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
 		}
-		vipGroupApplyBaseInfoDto.setOrganId(sysUser.getOrganId());
+		vipGroupApplyBaseInfoDto.setOrganId(Integer.parseInt(sysUser.getOrganId()));
 		//开课时间为排课的第一节课的开始时间
 		vipGroupApplyBaseInfoDto.setCourseStartDate(firstCourseSchedule.getStartClassTime());
 		//课程结束时间为排课的最后一节课的结束时间

mec-biz/src/main/resources/config/mybatis/CooperationOrganMapper.xml

@@ -81,7 +81,7 @@
         <where>
                 del_flag_ = 0
             <if test="search != null">
-                AND organ_id_ = #{search}
+                AND FIND_IN_SET(organ_id_,#{search})
             </if>
         </where>
         ORDER BY update_time_ DESC
@@ -100,7 +100,7 @@
 	</select>
 
     <select id="queryByOrganId" resultMap="CooperationOrgan">
-        SELECT * FROM cooperation_organ WHERE organ_id_ = #{organId} AND del_flag_ = 0
+        SELECT * FROM cooperation_organ WHERE FIND_IN_SET(organ_id_,#{organId}) AND del_flag_ = 0
     </select>
 
     <select id="queryNameByIds" resultType="java.util.Map">

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -472,8 +472,8 @@
         csts.teacher_role_,
         cs.schoole_id_,
         s.name_ school_name_,
-        if(ta.sign_in_status_ IS NULL,0,1) sign_in_status_,
-        if(ta.sign_out_status_ IS NULL,0,1) sign_out_status_,
+        if(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
+        if(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
         cs.teach_mode_
         FROM
         course_schedule_teacher_salary csts

mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -149,8 +149,17 @@
             <if test="courseEndDate != null">
                 and cs.class_date_ &lt;= #{courseEndDate}
             </if>
-            <if test="signInStatus != null">
-                and ta.sign_in_status_ = #{signInStatus}
+            <if test="signInStatus != null and signInStatus != 3">
+                AND ta.sign_in_status_ = #{signInStatus}
+            </if>
+            <if test="signOutStatus != null and signOutStatus != 3">
+                AND ta.sign_out_status_ = #{signOutStatus}
+            </if>
+            <if test="signOutStatus != null and signOutStatus = 3">
+                AND ta.sign_out_status_ IS NULL
+            </if>
+            <if test="signInStatus != null and signInStatus = 3">
+                AND ta.sign_in_status_ IS NULL
             </if>
             <if test="courseScheduleType != null">
                 and cs.type_ = #{courseScheduleType}
@@ -164,7 +173,9 @@
     <select id="getTeacherPersonalAttendances" parameterType="map" resultMap="teacherPersonalAttendance">
         SELECT
             cs.class_date_,cs.start_class_time_,cs.name_,cs.type_,
-            ta.sign_in_status_,ta.sign_out_status_,ta.remark_
+            IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
+            IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
+            ta.remark_
         FROM
             teacher_attendance ta
         LEFT JOIN course_schedule cs ON ta.course_schedule_id_=cs.id_

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -273,8 +273,8 @@
         SELECT su.* FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_
         <where>
-            <if test="organId != null and organId !=0">
-                t.organ_id_ = #{organId}
+            <if test="organId != null">
+                FIND_IN_SET(t.organ_id_,#{organId})
             </if>
         </where>
     </select>

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -117,7 +117,7 @@
 	<sql id="queryCondition">
 		<where>
 			vga.del_flag_=0
-			AND organ_id_=#{organId}
+			AND FIND_IN_SET(organ_id_,#{organId})
 		</where>
 	</sql>
 

mec-common/common-core/src/main/java/com/ym/mec/common/security/AuthUser.java

@@ -20,9 +20,9 @@ public class AuthUser extends User {
 	/**
 	 * 所在组织的编号
 	 */
-	private Integer organId;
+	private String organId;
 
-	public AuthUser(Integer userId, Integer organId, String username, String password, boolean enabled, boolean accountNonExpired,
+	public AuthUser(Integer userId, String organId, String username, String password, boolean enabled, boolean accountNonExpired,
 			boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.userId = userId;
@@ -37,11 +37,11 @@ public class AuthUser extends User {
 		this.userId = userId;
 	}
 
-	public Integer getOrganId() {
+	public String getOrganId() {
 		return organId;
 	}
 
-	public void setOrganId(Integer organId) {
+	public void setOrganId(String organId) {
 		this.organId = organId;
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/CooperationOrganController.java

@@ -58,7 +58,7 @@ public class CooperationOrganController extends BaseController {
     @ApiOperation(value = "根据机构编号获取合作单位(教学点)列表")
     @GetMapping("/queryByOrganId")
     @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/queryByOrganId')")
-    public Object queryByOrganId(Integer organId){
+    public Object queryByOrganId(String organId){
         return succeed(cooperationOrganService.queryByOrganId(organId));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/IndexController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -57,9 +58,15 @@ public class IndexController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 
-		Integer organId = sysUser.getOrganId();
+		String organIdStr = sysUser.getOrganId();
 		if (sysUser.getIsSuperAdmin()) {
-			organId = null;
+			organIdStr = null;
+		}else if(StringUtils.isEmpty(organIdStr)){
+			return failed(HttpStatus.INTERNAL_SERVER_ERROR, "分部信息错误");
+		}
+		Integer organId = null;
+		if(StringUtils.isNotEmpty(organIdStr)){
+			organId = Integer.parseInt(organIdStr);
 		}
 
 		Map<String, Integer> musicDatas = musicGroupDao.queryOrganMusicGroupNum(organId);

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -79,7 +79,7 @@ public class TeacherController extends BaseController {
     @GetMapping("/findTeachers")
     @PreAuthorize("@pcs.hasPermissions('teacher/findTeachers')")
     public HttpResponseResult findTeachers() {
-        Integer organId = sysUserFeignService.queryUserInfo().getOrganId();
+        String organId = sysUserFeignService.queryUserInfo().getOrganId();
         return succeed(teacherService.findTeachers(organId));
     }
 
@@ -87,8 +87,11 @@ public class TeacherController extends BaseController {
     @GetMapping("/findOrganTeacherBySubject")
     @PreAuthorize("@pcs.hasPermissions('teacher/findOrganTeacherBySubject')")
     public HttpResponseResult findOrganTeacherBySubject(Integer subjecId) {
-        Integer organId = sysUserFeignService.queryUserInfo().getOrganId();
-        return succeed(teacherService.findOrganTeacherBySubject(organId,subjecId));
+        String organId = sysUserFeignService.queryUserInfo().getOrganId();
+        if(StringUtils.isNotEmpty(organId)){
+            return succeed(teacherService.findOrganTeacherBySubject(Integer.parseInt(organId),subjecId));
+        }
+        return succeed(teacherService.findOrganTeacherBySubject(null,subjecId));
     }
 
     @ApiOperation(value = "获取乐团所有老师")

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupActivityController.java

@@ -48,7 +48,9 @@ public class VipGroupActivityController extends BaseController {
         if(sysUser == null){
             return failed("用户信息获取失败");
         }
-        queryInfo.setOrganId(sysUser.getOrganId());
+        if(sysUser.getOrganId() != null){
+            queryInfo.setOrganId(sysUser.getOrganId());
+        }
         return succeed(vipGroupActivityService.queryPage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupDefaultClassesUnitPriceController.java

@@ -7,6 +7,7 @@ import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -53,7 +54,9 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 		vipGroupDefaultClassesUnitPrice.setCreateTime(date);
 		vipGroupDefaultClassesUnitPrice.setUpdateTime(date);
 		if(Objects.isNull(vipGroupDefaultClassesUnitPrice.getOrganId())){
-			vipGroupDefaultClassesUnitPrice.setOrganId(sysUser.getOrganId());
+			if(sysUser.getOrganId() != null){
+				vipGroupDefaultClassesUnitPrice.setOrganId(Integer.parseInt(sysUser.getOrganId()));
+			}
 		}
 		vipGroupDefaultClassesUnitPriceService.insert(vipGroupDefaultClassesUnitPrice);
 		return succeed();