|
|
@@ -138,6 +138,7 @@ public class TrialClassificationTreeController extends BladeController {
|
|
|
}
|
|
|
trialClassificationTree.setClassificationAncestors(classificationAncestors.toString());
|
|
|
trialClassificationTree.setGroupType(dto.getGroupType());
|
|
|
+ trialClassificationTree.setSort(trialClassificationTree.getSort());
|
|
|
insertList.add(trialClassificationTree);
|
|
|
}
|
|
|
return R.status(trialClassificationTreeService.saveBatch(insertList));
|
|
|
@@ -165,7 +166,7 @@ public class TrialClassificationTreeController extends BladeController {
|
|
|
@PostMapping("/update")
|
|
|
@ApiOperationSupport(order = 5)
|
|
|
@ApiOperation(value = "修改", notes = "传入trialClassificationTree")
|
|
|
- public R update(Long id,String classificationName) {
|
|
|
+ public R update(Long id,String classificationName, Integer sort) {
|
|
|
if(id==null){
|
|
|
return R.fail("请选择要修改的分类");
|
|
|
}
|
|
|
@@ -174,7 +175,8 @@ public class TrialClassificationTreeController extends BladeController {
|
|
|
}
|
|
|
TrialClassificationTree trialClassificationTree = new TrialClassificationTree();
|
|
|
trialClassificationTree.setClassificationName(classificationName);
|
|
|
- return R.status(trialClassificationTreeService.update(new UpdateWrapper<TrialClassificationTree>().set("classification_name", classificationName).eq("id", id)));
|
|
|
+ return R.status(trialClassificationTreeService.update(new UpdateWrapper<TrialClassificationTree>()
|
|
|
+ .set(sort != null,"sort", sort).set("classification_name", classificationName).eq("id", id)));
|
|
|
}
|
|
|
|
|
|
// /**
|