bug

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Organization.java

@@ -3,9 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.entity.BaseEntity;
-
 import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
@@ -59,94 +57,6 @@ public class Organization extends BaseEntity {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Organization> organizations;
 
-	@ApiModelProperty(value = "分部经理",required = false)
-	private String organManager;
-
-	@ApiModelProperty(value = "乐团主管",required = false)
-	private String educationId;
-
-	@ApiModelProperty(value = "维修技师",required = false)
-	private String repairId;
-
-	@ApiModelProperty(value = "衔接老师",required = false)
-	private String joinTeacherId;
-
-	@ApiModelProperty(value = "分部经理",required = false)
-	private String organManagerName;
-
-	@ApiModelProperty(value = "乐团主管",required = false)
-	private String educationName;
-
-	@ApiModelProperty(value = "维修技师",required = false)
-	private String repairName;
-
-	@ApiModelProperty(value = "衔接老师",required = false)
-	private String joinTeacherName;
-
-	public String getJoinTeacherId() {
-		return joinTeacherId;
-	}
-
-	public void setJoinTeacherId(String joinTeacherId) {
-		this.joinTeacherId = joinTeacherId;
-	}
-
-	public String getJoinTeacherName() {
-		return joinTeacherName;
-	}
-
-	public void setJoinTeacherName(String joinTeacherName) {
-		this.joinTeacherName = joinTeacherName;
-	}
-
-	public String getOrganManagerName() {
-		return organManagerName;
-	}
-
-	public void setOrganManagerName(String organManagerName) {
-		this.organManagerName = organManagerName;
-	}
-
-	public String getEducationName() {
-		return educationName;
-	}
-
-	public void setEducationName(String educationName) {
-		this.educationName = educationName;
-	}
-
-	public String getRepairName() {
-		return repairName;
-	}
-
-	public void setRepairName(String repairName) {
-		this.repairName = repairName;
-	}
-
-	public String getOrganManager() {
-		return organManager;
-	}
-
-	public void setOrganManager(String organManager) {
-		this.organManager = organManager;
-	}
-
-	public String getEducationId() {
-		return educationId;
-	}
-
-	public void setEducationId(String educationId) {
-		this.educationId = educationId;
-	}
-
-	public String getRepairId() {
-		return repairId;
-	}
-
-	public void setRepairId(String repairId) {
-		this.repairId = repairId;
-	}
-
 	public String getAreaName() {
 		return areaName;
 	}

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

@@ -35,12 +35,6 @@ public interface OrganizationService extends BaseService<Integer, Organization>
      */
     Map<Integer, String> getGradeList(Integer id);
 
-    int updateOrgan(Organization organization);
-
-    Long add(Organization organization);
-
-    Map<String,Map<Integer,String>> getOrganRole(List<Integer> organIds);
-
     /**
     * @description: 获取员工能访问的分部列表
      * @param userId 当前用户
@@ -82,12 +76,4 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     */
     <T extends EducationBaseQueryInfo> T onlyEducation(T queryInfo);
 
-    /**
-    * @description: 校验当前用户是否只有教务老师角色,并给教务老师角色赋值
-     * @param queryInfo
-    * @return T
-    * @author zx
-    * @date 2022/1/6 18:11
-    */
-    <T extends EducationBaseQueryInfo> T onlyEducationInitClassId(T queryInfo);
 }

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

@@ -21,12 +21,14 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
-import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.enums.SysUserRoleEnum.EDUCATION;
@@ -43,8 +45,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Autowired
 	private EmployeeDao employeeDao;
 	@Autowired
-	private ClassGroupDao classGroupDao;
-	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private SysEmployeePositionService employeePositionService;
@@ -101,56 +101,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
 	@Override
-	public int updateOrgan(Organization organization) {
-		return organizationDao.update(initOrganization(organization));
-	}
-
-	@Override
-	public Long add(Organization organization) {
-		return organizationDao.insert(initOrganization(organization));
-	}
-
-	@Override
-	public Map<String,Map<Integer,String>> getOrganRole(List<Integer> organIds) {
-		List<Organization> organizationList = organizationDao.findOrgans(organIds);
-		if(organizationList == null || organizationList.size() == 0){
-			throw new BizException("分部信息不存在");
-		}
-		StringJoiner organManager = new StringJoiner(",")
-				,repairId = new StringJoiner(",")
-				,educationId = new StringJoiner(",")
-				,joinTeacherId = new StringJoiner(","),
-				userId = new StringJoiner(",");
-		for (Organization organization : organizationList) {
-			if(StringUtils.isNotEmpty(organization.getOrganManager())){
-				organManager.add(organization.getOrganManager());
-				userId.add(organization.getOrganManager());
-			}
-			if(StringUtils.isNotEmpty(organization.getRepairId())){
-				repairId.add(organization.getRepairId());
-				userId.add(organization.getRepairId());
-			}
-			if(StringUtils.isNotEmpty(organization.getEducationId())){
-				educationId.add(organization.getEducationId());
-				userId.add(organization.getEducationId());
-			}
-			if(StringUtils.isNotEmpty(organization.getJoinTeacherId())){
-				joinTeacherId.add(organization.getJoinTeacherId());
-				userId.add(organization.getJoinTeacherId());
-			}
-		}
-		Map<String,Map<Integer,String>> resultMap = new HashMap<>(4);
-		if(userId.length() > 0){
-			Map<Integer, String> educationalTeacherNameMap = MapUtil.convertMybatisMap(teacherDao.queryNameByIds(userId.toString()));
-			resultMap.put("organManager",getOrganManagerName(educationalTeacherNameMap,organManager.toString()));
-			resultMap.put("repairId",getOrganManagerName(educationalTeacherNameMap,repairId.toString()));
-			resultMap.put("educationId",getOrganManagerName(educationalTeacherNameMap,educationId.toString()));
-			resultMap.put("joinTeacherId",getOrganManagerName(educationalTeacherNameMap,joinTeacherId.toString()));
-		}
-		return resultMap;
-	}
-
-	@Override
 	public String getEmployeeOrgan(Integer userId, String organIds,Boolean isSuper) {
 		if(StringUtils.isEmpty(organIds)){
 			Integer tenantId = TenantContextHolder.getTenantId();
@@ -205,14 +155,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		return organizationDao.getOrgans(organIds,tenantId);
 	}
 
-    @Override
-    public <T extends EducationBaseQueryInfo> T onlyEducationInitClassId(T queryInfo) {
-		queryInfo = onlyEducation(queryInfo);
-		if(queryInfo.getEducationUserId() != null){
-			queryInfo.setClassGroupIds(classGroupDao.queryGroupClassGroupIds(queryInfo.getEducationUserId()));
-		}
-		return queryInfo;
-	}
 
     @Override
     public <T extends EducationBaseQueryInfo> T onlyEducation(T queryInfo) {
@@ -228,30 +170,4 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		}
 		return queryInfo;
     }
-
-    private Map<Integer,String> getOrganManagerName(Map<Integer, String> nameMap, String organManager){
-		Map<Integer,String> map = new HashMap<>();
-		if(StringUtils.isNotEmpty(organManager)){
-			List<Integer> organIds = Arrays.stream(organManager.split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
-			for (Integer organId : organIds) {
-				map.put(organId,nameMap.get(organId));
-			}
-		}
-		return map;
-	}
-	private String getName(String userIds){
-		if(StringUtils.isNotEmpty(userIds)){
-			return teacherDao.queryTeacherNameByTeacherIds(userIds);
-		}
-		return "";
-	}
-
-
-	private Organization initOrganization(Organization organization){
-		organization.setOrganManagerName(getName(organization.getOrganManager()));
-		organization.setEducationName(getName(organization.getEducationId()));
-		organization.setRepairName(getName(organization.getRepairId()));
-		organization.setJoinTeacherName(getName(organization.getJoinTeacherId()));
-		return organization;
-	}
 }

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

@@ -18,14 +18,6 @@
         <result column="linkman_" property="linkman"/>
         <result column="mobile_" property="mobile"/>
         <result column="address_" property="address"/>
-        <result column="organ_manager_" property="organManager"/>
-        <result column="education_id_" property="educationId"/>
-        <result column="join_teacher_id_" property="joinTeacherId"/>
-        <result column="join_teacher_name_" property="joinTeacherName"/>
-        <result column="repair_id_" property="repairId"/>
-        <result column="organ_manager_name_" property="organManagerName"/>
-        <result column="education_name_" property="educationName"/>
-        <result column="repair_name_" property="repairName"/>
         <result column="tenant_id_" property="tenantId"/>
         <result column="grade_type_" property="gradeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -44,12 +36,9 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Organization" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO organization (id_,name_,area_id_,create_time_,update_time_,
-                                  register_date_,linkman_,mobile_,address_,grade_type_,organ_manager_,education_id_,repair_id_,join_teacher_id_,
-                                  organ_manager_name_,education_name_,repair_name_,join_teacher_name_,tenant_id_)
+                                  register_date_,linkman_,mobile_,address_,grade_type_,tenant_id_)
         VALUES(#{id},#{name},#{areaId},now(),now(),#{registerDate},#{linkman},#{mobile},#{address},
-               #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-               ,#{organManager},#{educationId},#{repairId},#{joinTeacherId},#{organManagerName},
-               #{educationName},#{repairName},#{joinTeacherName},#{tenantId})
+               #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -59,14 +48,6 @@
             <if test="delFlag != null">
                 del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-                organ_manager_ = #{organManager},
-                education_id_ = #{educationId},
-                repair_id_ = #{repairId},
-                join_teacher_id_ = #{joinTeacherId},
-                organ_manager_name_ = #{organManagerName},
-                education_name_ = #{educationName},
-                repair_name_ = #{repairName},
-                join_teacher_name_ = #{joinTeacherName},
             <if test="areaId != null">
                 area_id_ = #{areaId},
             </if>

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

@@ -2,26 +2,20 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
-import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.tenant.TenantContextHolder;
-import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.Map;
 
 @RequestMapping("organization")
 @Api(tags = "分部服务")
@@ -62,7 +56,7 @@ public class OrganizationController extends BaseController {
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('organization/add')")
     public Object add(Organization organization){
-        return succeed(organizationService.add(organization));
+        return succeed(organizationService.insert(organization));
     }
 
     @ApiOperation(value = "根据分部编号删除分部")
@@ -77,7 +71,7 @@ public class OrganizationController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('organization/update')")
     public Object update(Organization organization){
         organization.setUpdateTime(new Date());
-        return succeed(organizationService.updateOrgan(organization));
+        return succeed(organizationService.update(organization));
     }
 
     @ApiOperation(value = "根据分部编号查询分部详情")
@@ -88,19 +82,6 @@ public class OrganizationController extends BaseController {
         return succeed(organizationService.get(id));
     }
 
-    @ApiOperation(value = "根据分部角色列表map")
-    @GetMapping("/getOrganRole")
-    @PreAuthorize("@pcs.hasPermissions('organization/getOrganRole')")
-    @ApiParam(value = "分部编号", required = true)
-    public Object getOrganRole(String organIds){
-        organIds = organizationService.getEmployeeOrgan(organIds);
-        if(StringUtils.isEmpty(organIds)){
-            return failed("分部信息异常");
-        }
-        List<Integer> collect = Arrays.stream(organIds.split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
-        return succeed(organizationService.getOrganRole(collect));
-    }
-
     @ApiOperation(value = "获取用户所在分部的年级列表）")
     @GetMapping("/getGradeList")
     @PreAuthorize("@pcs.hasPermissions('organization/getGradeList')")