Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseProfessionalController.java

@@ -73,7 +73,7 @@ public class BaseProfessionalController extends BaseController {
         if (StringUtils.isNull(baseProfessional) || StringUtils.isNull(baseProfessional.getId())) {
             return error("专业库id不能为空");
         }
-        return toAjax(baseProfessionalService.removeById(baseProfessional.getId()));
+        return toAjax(baseProfessionalService.deleteId(baseProfessional.getId()));
     }
 
     @ApiOperation(value = "批量删除专业库", notes = "必传 idList")
@@ -93,7 +93,7 @@ public class BaseProfessionalController extends BaseController {
         if (StringUtils.isNull(baseProfessional) || StringUtils.isNull(baseProfessional.getId())) {
             return error("专业库id和修改数据不能为空");
         }
-        return toAjax(baseProfessionalService.updateById(baseProfessional));
+        return toAjax(baseProfessionalService.updateProfessional(baseProfessional));
     }
 
     @ApiOperation(value = "查询专业库树结构", notes = "非必传 查询条件：品目名称")

purchase-system/src/main/java/com/ozs/base/service/BaseProfessionalService.java

@@ -25,4 +25,8 @@ public interface BaseProfessionalService extends IService<BaseProfessional> {
      * @return
      */
     AjaxResult downloadPathFile(String downloadPath, HttpServletRequest request, HttpServletResponse response);
+
+    int updateProfessional(BaseProfessional baseProfessional);
+
+    int deleteId(Integer id);
 }

purchase-system/src/main/java/com/ozs/base/service/impl/BaseProfessionalServiceImpl.java

@@ -128,6 +128,34 @@ public class BaseProfessionalServiceImpl extends ServiceImpl<BaseProfessionalMap
         return AjaxResult.success("下载失败");
     }
 
+    /**
+     * 修改--  判断当前修改数据是否存在子级数据，存在不能修改
+     *
+     * @param baseProfessional
+     * @return
+     */
+    @Override
+    public int updateProfessional(BaseProfessional baseProfessional) {
+        BaseProfessional baseProfessional1 = baseProfessionalMapper.selectById(baseProfessional.getId());
+        if (!StringUtils.isNull(baseProfessional.getProfessionalCode())) {
+            List<BaseProfessional> baseProfessionalList = baseProfessionalMapper.selectByParentCode(baseProfessional1.getProfessionalCode());
+            if (baseProfessionalList.size() > 0) {
+                throw new ServiceException(String.format("当前数据编码已有子级,不能修改编码！", baseProfessional.getProfessionalName()));
+            }
+        }
+        return baseProfessionalMapper.updateById(baseProfessional);
+    }
+
+    @Override
+    public int deleteId(Integer id) {
+        BaseProfessional baseProfessional = baseProfessionalMapper.selectById(id);
+        List<BaseProfessional> baseProfessionalList = baseProfessionalMapper.selectByParentCode(baseProfessional.getProfessionalCode());
+        if (baseProfessionalList.size() > 0) {
+            throw new ServiceException(String.format("当前数据编码已有子级,不能删除！", baseProfessional.getProfessionalName()));
+        }
+        return baseProfessionalMapper.updateById(baseProfessional);
+    }
+
     @Override
     public List<BaseProfessionalVo> selectBaseProfessionalVo(BaseProfessionalVo baseProfessionalVo) {
         List<BaseProfessional> allList = new ArrayList<>();