zhuan

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

@@ -67,6 +67,15 @@ public class BaseExpertController extends BaseController {
         baseExpertVo.setCreateTime(new Date());
         baseExpertVo.setUpdated(baseExpertVo.getCreated());
         baseExpertVo.setUpdateTime(baseExpertVo.getCreateTime());
+        if (!ObjectUtils.isEmpty(baseExpertVo.getMajorType())) {
+            return error("专业类型为空");
+        }
+        LambdaQueryWrapper<BaseProfessional> lw = new LambdaQueryWrapper();
+        lw.eq(BaseProfessional::getProfessionalCode, baseExpertVo.getMajorType());
+        List<BaseProfessional> list = baseProfessionalService.list(lw);
+        if (ObjectUtils.isEmpty(list) || list.size() < 1) {
+            return error("专业类型传值错误");
+        }
         return toAjax(baseExpertService.insertExpert(baseExpertVo));
     }
 
@@ -92,6 +101,15 @@ public class BaseExpertController extends BaseController {
 
         baseExpert.setUpdated(getUserId().toString());
         baseExpert.setUpdateTime(new Date());
+        if (!ObjectUtils.isEmpty(baseExpert.getMajorType())) {
+            return error("专业类型为空");
+        }
+        LambdaQueryWrapper<BaseProfessional> lw = new LambdaQueryWrapper();
+        lw.eq(BaseProfessional::getProfessionalCode, baseExpert.getMajorType());
+        List<BaseProfessional> list = baseProfessionalService.list(lw);
+        if (ObjectUtils.isEmpty(list) || list.size() < 1) {
+            return error("专业类型传值错误");
+        }
         return toAjax(baseExpertService.updateById(baseExpert));
     }
 
@@ -125,7 +143,7 @@ public class BaseExpertController extends BaseController {
             // 专业类型
             if (!org.apache.commons.lang3.StringUtils.isBlank(vo.getMajorType())) {
                 LambdaQueryWrapper<BaseProfessional> lwe = new LambdaQueryWrapper<>();
-                lwe.eq(BaseProfessional::getId, Integer.parseInt(vo.getMajorType()));
+                lwe.eq(BaseProfessional::getProfessionalCode, vo.getMajorType());
                 List<BaseProfessional> list1 = baseProfessionalService.list(lwe);
                 if (!ObjectUtils.isEmpty(list1)) {
                     vo.setMajorTypeName(list1.get(0).getProfessionalName());