commit

src/main/java/com/jz/dmp/modules/controller/DmpNavigationTreeController.java

@@ -51,13 +51,15 @@ public class DmpNavigationTreeController {
         return this.dmpNavigationTreeService.queryById(id);
     }
 
-    /**列表查询DMP资源导航树
+    /**
+     * 列表查询DMP资源导航树
+     *
      * @param dmpNavigationTreeRequest
      * @return
      */
     @RequestMapping(method = RequestMethod.POST, value = "/findList")
     @ApiOperation(value = "列表查询DMP资源导航树", notes = "列表查询DMP资源导航树")
-	public BaseBeanResponse<DmpNavigationTreeDto> findList(@RequestBody DmpNavigationTreeRequest dmpNavigationTreeRequest, HttpServletRequest httpRequest){
+    public BaseBeanResponse<DmpNavigationTreeDto> findList(@RequestBody DmpNavigationTreeRequest dmpNavigationTreeRequest, HttpServletRequest httpRequest) {
         BaseBeanResponse<DmpNavigationTreeDto> baseBeanResponse = new BaseBeanResponse<DmpNavigationTreeDto>();
         try {
             baseBeanResponse = dmpNavigationTreeService.findList(dmpNavigationTreeRequest, httpRequest);
@@ -70,14 +72,25 @@ public class DmpNavigationTreeController {
         return baseBeanResponse;
     }
 
-	/**新增DMP资源导航树
+    /**
+     * 新增DMP资源导航树
+     *
      * @param dmpNavigationTreeRequest
      * @return
      */
     @RequestMapping(method = RequestMethod.POST, value = "/add")
     @ApiOperation(value = "新增DMP资源导航树", notes = "新增DMP资源导航树")
-	public BaseBeanResponse<DmpNavigationTree> add(@RequestBody DmpNavigationTree dmpNavigationTree, HttpServletRequest httpRequest){
+    public BaseBeanResponse<DmpNavigationTree> add(@RequestBody DmpNavigationTree dmpNavigationTree, HttpServletRequest httpRequest) throws Exception {
         BaseBeanResponse<DmpNavigationTree> baseBeanResponse = new BaseBeanResponse<DmpNavigationTree>();
+        //树名称去重
+        DmpNavigationTreeRequest dmpNavigationTreeRequest = new DmpNavigationTreeRequest();
+        dmpNavigationTreeRequest.setName(dmpNavigationTree.getName());
+        BaseBeanResponse<DmpNavigationTreeDto> baseBeanResponseRe = dmpNavigationTreeService.findList(dmpNavigationTreeRequest, httpRequest);
+        if (baseBeanResponseRe.getDatas() != null && baseBeanResponseRe.getDatas().size() > 0) {
+            baseBeanResponse.setCode(StatuConstant.CODE_ERROR_PARAMETER);
+            baseBeanResponse.setMessage("树名称不能重复");
+            return baseBeanResponse;
+        }
         try {
             DmpNavigationTree dmpNavigationTreeDb = dmpNavigationTreeService.insert(dmpNavigationTree);
             baseBeanResponse.setCode(StatuConstant.SUCCESS_CODE);
@@ -92,7 +105,9 @@ public class DmpNavigationTreeController {
         return baseBeanResponse;
     }
 
-	/**删除DMP资源导航树
+    /**
+     * 删除DMP资源导航树
+     *
      * @param id
      * @return
      */
@@ -100,7 +115,7 @@ public class DmpNavigationTreeController {
     @RequestMapping(method = RequestMethod.GET, value = "/deleteById")
     @ApiOperation(value = "删除DMP资源导航树", notes = "删除DMP资源导航树")
     @ApiImplicitParam(name = "id", value = "DMP资源导航树主键")
-	public BaseResponse deleteById(@RequestParam(name = "id", required = true ) Integer id, HttpServletRequest httpRequest){
+    public BaseResponse deleteById(@RequestParam(name = "id", required = true) Integer id, HttpServletRequest httpRequest) {
         BaseResponse baseResponse = new BaseResponse();
         try {
             boolean flag = dmpNavigationTreeService.deleteById(id);
@@ -120,14 +135,16 @@ public class DmpNavigationTreeController {
         return baseResponse;
     }
 
-	/**修改DMP资源导航树
+    /**
+     * 修改DMP资源导航树
+     *
      * @param dmpNavigationTreeRequest
      * @return
      */
     @MethodCallLogPrint
     @RequestMapping(method = RequestMethod.POST, value = "/edit")
     @ApiOperation(value = "修改DMP资源导航树", notes = "修改DMP资源导航树")
-	public BaseBeanResponse<DmpNavigationTree> edit(@RequestBody DmpNavigationTree dmpNavigationTree, HttpServletRequest httpRequest){
+    public BaseBeanResponse<DmpNavigationTree> edit(@RequestBody DmpNavigationTree dmpNavigationTree, HttpServletRequest httpRequest) {
         BaseBeanResponse<DmpNavigationTree> baseBeanResponse = new BaseBeanResponse<DmpNavigationTree>();
         try {
             DmpNavigationTree dmpNavigationTreeDb = dmpNavigationTreeService.update(dmpNavigationTree);

src/main/java/com/jz/dmp/modules/service/impl/DmpNavigationTreeServiceImpl.java

@@ -165,7 +165,9 @@ public class DmpNavigationTreeServiceImpl extends BaseService implements DmpNavi
 		
 		List<DmpNavigationTreeDto> dtos = MyDmpNavigationTreeConverter.INSTANCE().domain2dto(list);
 
+		if (dmpNavigationTreeRequest.getParentId()!=null){
 			dtos = dmpArrangeTree(dmpNavigationTreeRequest.getParentId(), dtos);
+		}
 
 		baseBeanResponse.setCode(StatuConstant.SUCCESS_CODE);
 		baseBeanResponse.setMessage("查询成功");