bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CardDetailDto.java

@@ -9,6 +9,7 @@ public class CardDetailDto {
     private String title;
     private String makeMethod;
     private String content;
+    private String htmlContent;
     private String type;
     private String paperType;
 
@@ -44,6 +45,14 @@ public class CardDetailDto {
         this.content = content;
     }
 
+    public String getHtmlContent() {
+        return htmlContent;
+    }
+
+    public void setHtmlContent(String htmlContent) {
+        this.htmlContent = htmlContent;
+    }
+
     public String getType() {
         return type;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDetailDto.java

@@ -6,6 +6,7 @@ package com.qmth.distributed.print.business.bean.dto;
 public class ExamTaskDetailDto {
 
     private String id;
+    private String examDetailId;
     private String printPlanId;
     private String printPlanName;
     private String paperNumber;
@@ -34,6 +35,14 @@ public class ExamTaskDetailDto {
         this.id = id;
     }
 
+    public String getExamDetailId() {
+        return examDetailId;
+    }
+
+    public void setExamDetailId(String examDetailId) {
+        this.examDetailId = examDetailId;
+    }
+
     public String getPrintPlanId() {
         return printPlanId;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/SchoolDto.java

@@ -8,6 +8,7 @@ public class SchoolDto {
     private String id;
     private String name;
     private Boolean enable;
+    private String logo;
 
     public String getId() {
         return id;
@@ -32,4 +33,12 @@ public class SchoolDto {
     public void setEnable(Boolean enable) {
         this.enable = enable;
     }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/RelatePaperParam.java

@@ -7,24 +7,24 @@ import com.qmth.distributed.print.business.base.BasePage;
  */
 public class RelatePaperParam extends BasePage {
 
+    private Long printPlanId;
     private Long examTaskId;
-    private String paperNumber;
     private String relatePaperType;
 
-    public Long getExamTaskId() {
-        return examTaskId;
+    public Long getPrintPlanId() {
+        return printPlanId;
     }
 
-    public void setExamTaskId(Long examTaskId) {
-        this.examTaskId = examTaskId;
+    public void setPrintPlanId(Long printPlanId) {
+        this.printPlanId = printPlanId;
     }
 
-    public String getPaperNumber() {
-        return paperNumber;
+    public Long getExamTaskId() {
+        return examTaskId;
     }
 
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
+    public void setExamTaskId(Long examTaskId) {
+        this.examTaskId = examTaskId;
     }
 
     public String getRelatePaperType() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamDetailCourseService.java

@@ -23,4 +23,6 @@ public interface ExamDetailCourseService extends IService<ExamDetailCourse> {
     double calculatePackagesByDetailId(Long examDetailId);
 
     List<ExamDetailCourse> listByExamDetailId(Long examDetailId);
+
+    List<ExamDetailCourse> listDetailCourseByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamDetailService.java

@@ -10,6 +10,7 @@ import com.qmth.distributed.print.business.bean.result.ExaminationDetailResult;
 import com.qmth.distributed.print.business.bean.result.ExaminationResult;
 import com.qmth.distributed.print.business.bean.result.SummarizedDataResult;
 import com.qmth.distributed.print.business.entity.ExamDetail;
+import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -157,6 +158,7 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     List<ExamDetail> listByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber);
 
+
     List<ExamDetail> listByExamPrintId(Long printPlanId);
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamStudentService.java

@@ -1,8 +1,11 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.entity.ExamStudent;
 
+import java.util.List;
+
 /**
  * <p>
  * 考生 服务类
@@ -13,4 +16,5 @@ import com.qmth.distributed.print.business.entity.ExamStudent;
  */
 public interface ExamStudentService extends IService<ExamStudent> {
 
+    void updatePaperType(List<ExamDetailCourse> examDetailCourses, String relatePaperType);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamTaskDetailService.java

@@ -6,6 +6,7 @@ import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailDto;
 import com.qmth.distributed.print.business.bean.params.RelatePaperParam;
 import com.qmth.distributed.print.business.entity.ExamTaskDetail;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +21,7 @@ public interface ExamTaskDetailService extends IService<ExamTaskDetail> {
 
     boolean enable(ExamTaskDetail examTaskDetail);
 
-    boolean updatePaper(RelatePaperParam paperParam);
+    boolean updatePaper(RelatePaperParam paperParam) throws IOException;
 
     IPage<ExamTaskDetailDto> list(String relateType, Long printPlanId, String courseCode, String paperNumber, Integer pageNumber, Integer pageSize);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamTaskService.java

@@ -56,7 +56,7 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     IPage<ExamTaskDetailDto> listTaskPaper(String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
-    List<RelatePaperDto> listPaperTypes(String courseCode);
+    List<RelatePaperDto> listPaperTypes(Long examTaskId, Long printPlanId);
 
     boolean saveExamTaskDetail(ExamTaskDetail examTaskDetail) throws IOException;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamDetailCourseServiceImpl.java

@@ -33,4 +33,14 @@ public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMap
     public List<ExamDetailCourse> listByExamDetailId(Long examDetailId) {
         return this.baseMapper.listByExamDetailId(examDetailId, ExamDetailStatusEnum.FINISH.name());
     }
+
+    @Override
+    public List<ExamDetailCourse> listDetailCourseByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber) {
+        QueryWrapper<ExamDetailCourse> examDetailCourseQueryWrapper = new QueryWrapper<>();
+        examDetailCourseQueryWrapper.lambda().eq(ExamDetailCourse::getSchoolId, schoolId)
+                .eq(ExamDetailCourse::getCourseCode, courseCode)
+                .eq(ExamDetailCourse::getPaperNumber, paperNumber);
+        List<ExamDetailCourse> examDetailCourses = this.list(examDetailCourseQueryWrapper);
+        return examDetailCourses;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamStudentServiceImpl.java

@@ -1,11 +1,15 @@
 package com.qmth.distributed.print.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.distributed.print.business.mapper.ExamStudentMapper;
 import com.qmth.distributed.print.business.service.ExamStudentService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 考生 服务实现类
@@ -17,4 +21,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamStudent> implements ExamStudentService {
 
+    @Override
+    public void updatePaperType(List<ExamDetailCourse> examDetailCourses, String relatePaperType) {
+        UpdateWrapper<ExamStudent> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().set(ExamStudent::getPaperType, relatePaperType).in(ExamStudent::getExamDetailCourseId, examDetailCourses);
+        this.update(updateWrapper);
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskDetailServiceImpl.java

@@ -8,20 +8,25 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailDto;
 import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.bean.params.RelatePaperParam;
+import com.qmth.distributed.print.business.entity.ExamDetail;
+import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskDetail;
+import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
+import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.mapper.ExamTaskDetailMapper;
-import com.qmth.distributed.print.business.service.CommonService;
-import com.qmth.distributed.print.business.service.ExamTaskDetailService;
-import com.qmth.distributed.print.business.service.ExamTaskService;
+import com.qmth.distributed.print.business.service.*;
+import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -37,9 +42,21 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     @Autowired
     private ExamTaskService examTaskService;
 
+    @Autowired
+    private ExamDetailService examDetailService;
+
+    @Autowired
+    private ExamDetailCourseService examDetailCourseService;
+
+    @Autowired
+    private ExamStudentService examStudentService;
+
     @Autowired
     private CommonService commonService;
 
+    @Resource
+    AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
+
     @Override
     public boolean enable(ExamTaskDetail examTaskDetail) {
         UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
@@ -49,16 +66,33 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
 
     @Transactional
     @Override
-    public boolean updatePaper(RelatePaperParam paperParam) {
-        // 更新试卷编号
-        UpdateWrapper<ExamTask> examTaskUpdateWrapper = new UpdateWrapper<>();
-        examTaskUpdateWrapper.lambda().set(ExamTask::getPaperNumber, paperParam.getPaperNumber());
-        examTaskService.update(examTaskUpdateWrapper);
+    public boolean updatePaper(RelatePaperParam paperParam) throws IOException {
+        ExamTask examTask = examTaskService.getById(paperParam.getExamTaskId());
+
+        // 提交印刷的考场，不允许修改关联试卷
+        List<ExamDetail> examDetails = examDetailService.listByCourseCodeAndPaperNumber(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
+        examDetails = examDetails.stream().filter(m->!ExamDetailStatusEnum.NEW.equals(m.getStatus()) && !ExamDetailStatusEnum.READY.equals(m.getStatus())).collect(Collectors.toList());
+        if(!examDetails.isEmpty()){
+            throw ExceptionResultEnum.ERROR.exception("有考场已开始打印，不能修改");
+        }
 
+        /* // 异常任务中修改类型
         // 更新关联卷型
         UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(ExamTaskDetail::getRelatePaperType, paperParam.getRelatePaperType()).eq(ExamTaskDetail::getExamTaskId, paperParam.getExamTaskId());
         this.update(updateWrapper);
+
+        // 更新考生关联类型
+        examStudentService.updatePaperType(examDetailCourses, paperParam.getRelatePaperType());*/
+
+        // 重新生成pdf
+        List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listDetailCourseByCourseCodeAndPaperNumber(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
+        List<Long> examDetailCourseIds = examDetailCourses.stream().map(m->m.getId()).collect(Collectors.toList());
+        Map<String, Object> map = new HashMap<>();
+        map.computeIfAbsent("printPlanId", v -> paperParam.getPrintPlanId());
+        map.computeIfAbsent("examDetailCourseIds", v -> examDetailCourseIds);
+        map.computeIfAbsent("paperType", v -> paperParam.getRelatePaperType());
+        asyncCreatePdfTempleteService.createPdf(map);
         return true;
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -11,6 +11,7 @@ import com.google.gson.Gson;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.*;
+import com.qmth.distributed.print.business.enums.DrawRuleEnum;
 import com.qmth.distributed.print.business.enums.ExamCardStatusEnum;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
@@ -79,6 +80,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Autowired
     private ExamDetailCourseService examDetailCourseService;
 
+    @Autowired
+    private ExamPrintPlanService examPrintPlanService;
+
     @Override
     public List<ExamTask> listByCourseCode(Long schoolId, String code) {
         QueryWrapper<ExamTask> queryWrapper = new QueryWrapper<>();
@@ -193,7 +197,18 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         examTask.setSchoolId(schoolId);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
-        // todo paperNumber生成问题， 必填字段校验
+        if(StringUtils.isNotBlank(examTask.getPaperNumber())){
+            QueryWrapper<ExamTask> taskQueryWrapper = new QueryWrapper<>();
+            taskQueryWrapper.lambda().eq(ExamTask::getSchoolId, schoolId).eq(ExamTask::getPaperNumber, examTask.getPaperNumber());
+            ExamTask task = this.getOne(taskQueryWrapper);
+            if(task != null){
+                throw ExceptionResultEnum.ERROR.exception("试卷编号已存在");
+            }
+        } else {
+            // todo paperNumber生成问题， 必填字段校验
+
+        }
+
         QueryWrapper<BasicExamRule> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicExamRule::getSchoolId, examTask.getSchoolId());
         BasicExamRule basicExamRule = basicExamRuleService.getOne(queryWrapper);
@@ -332,6 +347,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setCourseCode(examTaskTemp.getCourseCode());
             examTask.setCourseName(examTaskTemp.getCourseName());
             examTask.setSpecialty(examTaskTemp.getSpecialty());
+            // todo paperNumber自动生成。校验paperNumber是否重复
             examTask.setPaperNumber(examTaskTemp.getPaperNumber());
             examTask.setStartTime(task.getStartTime());
             examTask.setEndTime(task.getEndTime());
@@ -446,8 +462,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public List<RelatePaperDto> listPaperTypes(String courseCode) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+    public List<RelatePaperDto> listPaperTypes(Long examTaskId, Long printPlanId) {
+        /*Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<RelatePaperDto> list = this.baseMapper.listPaperNumbers(schoolId, courseCode);
         for (RelatePaperDto relatePaperDto : list) {
             QueryWrapper<ExamTaskDetail> queryWrapper = new QueryWrapper<>();
@@ -455,8 +471,32 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             ExamTaskDetail examTaskDetail = this.examTaskDetailService.getOne(queryWrapper);
             if (examTaskDetail != null) {
                 String unexposedPaperType = examTaskDetail.getUnexposedPaperType();
-                relatePaperDto.setPaperTypes(StringUtils.isBlank(unexposedPaperType) ? null : Arrays.asList(unexposedPaperType.split("/")));
+                relatePaperDto.setPaperTypes(StringUtils.isBlank(unexposedPaperType) ? null : Arrays.asList(unexposedPaperType.split(",")));
+            }
+        }
+        return list;*/
+
+        QueryWrapper<ExamTaskDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ExamTaskDetail::getExamTaskId, examTaskId).eq(ExamTaskDetail::getEnable, true);
+        ExamTaskDetail examTaskDetail = this.examTaskDetailService.getOne(queryWrapper);
+        List<RelatePaperDto> list = new ArrayList<>();
+        if (examTaskDetail != null) {
+            // 抽取规则
+            ExamPrintPlan examPrintPlan = examPrintPlanService.getById(printPlanId);
+            DrawRuleEnum drawRule = examPrintPlan.getDrawRule();
+
+            RelatePaperDto relatePaperDto = new RelatePaperDto();
+            // 抽取一次
+            String paperTypes;
+            if (DrawRuleEnum.ONE.equals(drawRule)){
+                // 未曝光类型
+                paperTypes = examTaskDetail.getUnexposedPaperType();
+            } else {
+                // 所有类型
+                paperTypes = examTaskDetail.getPaperType();
             }
+            relatePaperDto.setPaperTypes(StringUtils.isBlank(paperTypes) ? null : Arrays.asList(paperTypes.split(",")));
+            list.add(relatePaperDto);
         }
         return list;
     }

distributed-print-business/src/main/resources/mapper/BasicSchoolMapper.xml

@@ -21,7 +21,7 @@
         code, name, enable, access_key, access_secret, remark, create_time, update_time
     </sql>
     <select id="listSchool" resultType="com.qmth.distributed.print.business.bean.dto.SchoolDto">
-        select id, name, enable from basic_school where enable = true
+        select id, name, enable, logo from basic_school where enable = true
     </select>
 
 </mapper>

distributed-print-business/src/main/resources/mapper/ExamCardMapper.xml

@@ -84,6 +84,7 @@
             a.make_method makeMethod,
             a.type,
             b.content,
+            b.html_content htmlContent,
             c.paper_type paperType
         FROM
             exam_card a

distributed-print-business/src/main/resources/mapper/ExamTaskDetailMapper.xml

@@ -39,23 +39,32 @@
             d.exposed_paper_type exposedPaperType,
             d.unexposed_paper_type unexposedPaperType,
             d.relate_paper_type relatePaperType,
-            b.total_subjects totalSubjects
+            a.total_subjects totalSubjects
+        FROM
+        (SELECT
+            a.school_id,
+            a.print_plan_id,
+            a.print_plan_name,
+            b.paper_number,
+            b.course_code,
+            b.course_name,
+            SUM(b.total_subjects) total_subjects
         FROM
             exam_detail a
-        LEFT JOIN
-            exam_detail_course b ON a.id = b.exam_detail_id
-        LEFT JOIN
-            exam_task c ON a.school_id = c.school_id
-            AND b.course_code = c.course_code
-            AND b.paper_number = c.paper_number
-        LEFT JOIN
-            exam_task_detail d ON c.id = d.exam_task_id
-        LEFT JOIN
-            basic_card_rule e ON c.card_rule_id = e.id
-        LEFT JOIN
-            sys_user f ON c.user_id = f.id
-        LEFT JOIN
-            sys_user g ON c.create_id = g.id
+            LEFT JOIN exam_detail_course b ON a.id = b.exam_detail_id
+        GROUP BY a.school_id , a.print_plan_id , a.print_plan_name , b.paper_number , b.course_code , b.course_name) a
+            LEFT JOIN
+        exam_task c ON a.school_id = c.school_id
+            AND a.course_code = c.course_code
+            AND a.paper_number = c.paper_number
+            LEFT JOIN
+        exam_task_detail d ON c.id = d.exam_task_id
+            LEFT JOIN
+        basic_card_rule e ON c.card_rule_id = e.id
+            LEFT JOIN
+        sys_user f ON c.user_id = f.id
+            LEFT JOIN
+        sys_user g ON c.create_id = g.id
         <where>
             <if test="schoolId != null and schoolId != ''">
                and a.school_id = #{schoolId}

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPrintPlanController.java

@@ -144,7 +144,7 @@ public class ExamPrintPlanController {
      */
     @ApiOperation(value = "关联/更换试卷")
     @RequestMapping(value = "/relate_update", method = RequestMethod.POST)
-    public Result relateUpdate(@RequestBody RelatePaperParam paperParam) {
+    public Result relateUpdate(@RequestBody RelatePaperParam paperParam) throws IOException {
         boolean isSuccess = examTaskDetailService.updatePaper(paperParam);
         return ResultUtil.ok(isSuccess);
     }
@@ -152,13 +152,14 @@ public class ExamPrintPlanController {
     /**
      * 查询所有试卷编号/关联卷型
      *
-     * @param courseCode
+     * @param examTaskId
      * @return
      */
     @ApiOperation(value = "查询所有试卷编号/关联卷型")
     @RequestMapping(value = "/relate_get_paper_numbers", method = RequestMethod.POST)
-    public Result relateGetPaperNumbers(@RequestParam(value = "courseCode", required = true) String courseCode) {
-        List<RelatePaperDto> list = examTaskService.listPaperTypes(courseCode);
+    public Result relateGetPaperNumbers(@RequestParam(value = "examTaskId", required = true) Long examTaskId,
+                                        @RequestParam(value = "printPlanId", required = true) Long printPlanId) {
+        List<RelatePaperDto> list = examTaskService.listPaperTypes(examTaskId, printPlanId);
         return ResultUtil.ok(list);
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/SysOrgController.java

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print.api;
 
 
+import com.itextpdf.text.log.SysoCounter;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
@@ -73,13 +74,13 @@ public class SysOrgController {
 
     /**
      * 删除
-     * @param id
+     * @param org
      * @return
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(Long id) {
-        boolean isSuccess = sysOrgService.remove(id);
+    public Result remove(@RequestBody SysOrg org) {
+        boolean isSuccess = sysOrgService.remove(org.getId());
         return ResultUtil.ok(isSuccess);
     }