机构整合

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysOrg.java

@@ -1,5 +1,6 @@
 package com.qmth.teachcloud.common.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -35,8 +36,8 @@ public class SysOrg extends BaseEntity implements Serializable {
      */
     private String code;
 
-//    @NotNull(message = "机构类型不能为空")
     @ApiModelProperty(value = "类型，COLLEGE：学院，FACULTY：院系，TEACHING_ROOM：教研室，PRINTING_HOUSE：印刷厂")
+    @TableField(value = "type", updateStrategy = FieldStrategy.IGNORED)
     private OrgTypeEnum type;
 
     /**
@@ -54,11 +55,6 @@ public class SysOrg extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
 
-//    @ApiModelProperty(value = "校区id")
-//    @JsonSerialize(using = ToStringSerializer.class)
-//    @TableField(exist = false)
-//    private Long campusId;
-
     @ApiModelProperty("历史机构名")
     private String historicName;
 
@@ -82,14 +78,6 @@ public class SysOrg extends BaseEntity implements Serializable {
         this.historicName = historicName;
     }
 
-//    public Long getCampusId() {
-//        return campusId;
-//    }
-
-//    public void setCampusId(Long campusId) {
-//        this.campusId = campusId;
-//    }
-
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -51,9 +51,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Resource
     SysOrgMapper sysOrgMapper;
 
-//    @Resource
-//    BasicCampusService basicCampusService;
-
     @Override
     public List<OrgDto> listOrgTree(SpecialPrivilegeEnum specialPrivilegeEnum) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -119,37 +116,13 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
             org.setSchoolId(schoolId);
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-
-//            QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.lambda().eq(SysOrg::getSchoolId, org.getSchoolId()).eq(SysOrg::getParentId, org.getParentId()));
-//            SysOrg sysOrg = this.getOne(queryWrapper);
-
             if (org.getId() == null) {// 新增
-//                if (sysOrg != null) {
-//                    throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
-//                }
-//                checkOrgTree(org);
                 org.insertInfo(sysUser.getId());
                 success = this.save(org);
             } else { // 修改
-//                if (sysOrg != null && org.getId().longValue() != sysOrg.getId().longValue()) {
-//                    throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
-//                }
                 org.updateInfo(sysUser.getId());
                 success = this.updateById(org);
             }
-//            if (Objects.nonNull(org.getCampusId())) {//更新校区
-//                BasicCampus basicCampus = basicCampusService.getById(org.getCampusId());
-//                if (Objects.nonNull(basicCampus) && Objects.nonNull(basicCampus.getPrintHouseId())
-//                        && basicCampus.getPrintHouseId().longValue() != org.getId().longValue()) {
-//                    throw ExceptionResultEnum.ERROR.exception("该校区已绑定其它印刷室");
-//                }
-//
-//                UpdateWrapper<BasicCampus> basicCampusUpdateWrapper = new UpdateWrapper<>();
-//                basicCampusUpdateWrapper.lambda().eq(BasicCampus::getId, org.getCampusId())
-//                        .set(BasicCampus::getPrintHouseId, org.getId());
-//                basicCampusService.update(basicCampusUpdateWrapper);
-//            }
         } catch (Exception e) {
             if (e instanceof DuplicateKeyException) {
                 String errorColumn = e.getCause().toString();
@@ -197,35 +170,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         }
     }
 
-//    /**
-//     * 校验各机构关系
-//     *
-//     * @param org
-//     */
-//    private void checkOrgTree(SysOrg org) {
-//        // 印刷厂不能设置子机构
-//        if (Objects.nonNull(org.getParentId())) {
-//            SysOrg parentOrg = this.getById(org.getParentId());
-//            if (Objects.nonNull(parentOrg) && OrgTypeEnum.COLLEGE.equals(parentOrg.getType())) {
-//                if (!OrgTypeEnum.FACULTY.equals(org.getType()) && !OrgTypeEnum.TEACHING_ROOM.equals(org.getType())) {
-//                    throw ExceptionResultEnum.ERROR.exception("学院下只能设置院系或者教研室");
-//                }
-//            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.FACULTY.equals(parentOrg.getType())) {
-//                if (!OrgTypeEnum.TEACHING_ROOM.equals(org.getType())) {
-//                    throw ExceptionResultEnum.ERROR.exception("院系下只能设置教研室");
-//                }
-//            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.TEACHING_ROOM.equals(parentOrg.getType())) {
-//                throw ExceptionResultEnum.ERROR.exception("教研室下不能设置子机构");
-//            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.PRINTING_HOUSE.equals(parentOrg.getType())) {
-//                throw ExceptionResultEnum.ERROR.exception("印刷厂不能设置子机构");
-//            }
-//        } else {
-//            if (!OrgTypeEnum.COLLEGE.equals(org.getType()) && !OrgTypeEnum.PRINTING_HOUSE.equals(org.getType())) {
-//                throw ExceptionResultEnum.ERROR.exception("一级机构只能设置学院或者印刷厂");
-//            }
-//        }
-//    }
-
     @Override
     public SysOrg findByForeignKey(Long schoolId, String collegeCode, String collegeName) {
         List<SysOrg> tbSchoolCollegeList = this.list(new QueryWrapper<SysOrg>().lambda()