售价体系bug

sd-business/src/main/java/com/sd/business/controller/department/DepartmentController.java

@@ -7,6 +7,7 @@ import com.sd.business.entity.department.dto.DepartmentSelectDto;
 import com.sd.business.entity.department.vo.DepartmentVo;
 import com.sd.business.service.department.DepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,7 +49,7 @@ public class DepartmentController {
      * 事业部新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody DepartmentDto departmentDto) {
+    public void add(@Validated @RequestBody DepartmentDto departmentDto) {
         departmentService.add(departmentDto);
     }
 
@@ -56,7 +57,7 @@ public class DepartmentController {
      * 事业部编辑
      */
     @PostMapping("/edit")
-    public void edit(@RequestBody DepartmentDto departmentDto) {
+    public void edit(@Validated @RequestBody DepartmentDto departmentDto) {
         departmentService.edit(departmentDto);
     }
 

sd-business/src/main/java/com/sd/business/entity/department/po/Department.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 
 /**
@@ -23,16 +24,19 @@ public class Department extends BasePo {
     /**
      * 管理员账号
      */
+    @NotBlank(message = "管理员账号不能为空")
     private String adminUsername;
 
     /**
      * 管理员密码
      */
+    @NotBlank(message = "管理员密码不能为空")
     private String adminPassword;
 
     /**
      * 事业部
      */
+    @NotBlank(message = "事业部名称不能为空")
     private String name;
 
     /**

sd-business/src/main/java/com/sd/business/service/bom/impl/BomServiceImpl.java

@@ -76,7 +76,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomSe
             if (bomIdList.size() == 0) {
                 return new Page<>();
             }
-            wrapper.eq("b", Bom::getId, bomIdList);
+            wrapper.in("b", Bom::getId, bomIdList);
         }
         if (ObjectUtil.isNotNull(dto.getBomClassifyId())) {
             List<Long> childrenIdList = bomClassifyService.getChildrenIdList(dto.getBomClassifyId());