|
@@ -1,5 +1,6 @@
|
|
|
package com.ozs.web.controller.base;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.ozs.base.domain.BaseProfessional;
|
|
|
import com.ozs.base.domain.vo.BaseProfessionalVo;
|
|
|
import com.ozs.base.service.BaseProfessionalService;
|
|
@@ -20,6 +21,7 @@ import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.exception.ExceptionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.MediaType;
|
|
@@ -62,6 +64,12 @@ public class BaseProfessionalController extends BaseController {
|
|
|
|| StringUtils.isNull(baseProfessional.getParentCode())) {
|
|
|
return error("专业库名称、编码、一级分类、父级ID 不能为空");
|
|
|
}
|
|
|
+ LambdaQueryWrapper<BaseProfessional> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.eq(BaseProfessional::getProfessionalCode, baseProfessional.getProfessionalCode());
|
|
|
+ List<BaseProfessional> list = baseProfessionalService.list(wrapper);
|
|
|
+ if (!ObjectUtils.isEmpty(list)) {
|
|
|
+ return AjaxResult.error("编码信息不可重复使用!");
|
|
|
+ }
|
|
|
return toAjax(baseProfessionalService.save(baseProfessional));
|
|
|
}
|
|
|
|
|
@@ -93,6 +101,13 @@ public class BaseProfessionalController extends BaseController {
|
|
|
if (StringUtils.isNull(baseProfessional) || StringUtils.isNull(baseProfessional.getId())) {
|
|
|
return error("专业库id和修改数据不能为空");
|
|
|
}
|
|
|
+ LambdaQueryWrapper<BaseProfessional> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.eq(BaseProfessional::getProfessionalCode, baseProfessional.getProfessionalCode());
|
|
|
+ wrapper.ne(BaseProfessional::getId, baseProfessional.getId());
|
|
|
+ List<BaseProfessional> list = baseProfessionalService.list(wrapper);
|
|
|
+ if (!ObjectUtils.isEmpty(list)) {
|
|
|
+ return AjaxResult.error("编码信息不可重复使用!");
|
|
|
+ }
|
|
|
return toAjax(baseProfessionalService.updateProfessional(baseProfessional));
|
|
|
}
|
|
|
|
|
@@ -144,7 +159,7 @@ public class BaseProfessionalController extends BaseController {
|
|
|
FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
- log.error("下载文件失败" , e);
|
|
|
+ log.error("下载文件失败", e);
|
|
|
}
|
|
|
}
|
|
|
|