商标

src/main/java/com/izouma/uwip/domain/Partner.java

@@ -8,6 +8,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -18,6 +19,7 @@ import javax.persistence.Enumerated;
 @Builder
 @NoArgsConstructor
 @Entity
+@Where(clause = "del = 0")
 @ApiModel(value = "客户/供应商管理")
 public class Partner extends BaseEntity {
     /**

src/main/java/com/izouma/uwip/web/LogoPatentController.java

@@ -40,7 +40,8 @@ public class LogoPatentController extends BaseController {
     @PostMapping("/all")
     public Page<LogoPatent> all(@RequestBody PageQuery pageQuery) {
         pageQuery.setSort("createdAt,desc");
-        Map<Long, String> partnerMap = partnerRepo.findAll()
+        List<Partner> partners = partnerRepo.findAll();
+        Map<Long, String> partnerMap = partners
                 .stream()
                 .collect(Collectors.toMap(Partner::getId, Partner::getName));
         return logoPatentService.all(pageQuery).map(logoPatent -> {

src/main/java/com/izouma/uwip/web/PartnerController.java

@@ -1,4 +1,6 @@
 package com.izouma.uwip.web;
+
+import cn.hutool.core.util.StrUtil;
 import com.izouma.uwip.domain.Partner;
 import com.izouma.uwip.service.PartnerService;
 import com.izouma.uwip.dto.PageQuery;
@@ -20,11 +22,14 @@ import java.util.List;
 @AllArgsConstructor
 public class PartnerController extends BaseController {
     private PartnerService partnerService;
-    private PartnerRepo partnerRepo;
+    private PartnerRepo    partnerRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public Partner save(@RequestBody Partner record) {
+        if (StrUtil.isBlank(record.getName())) {
+            throw new BusinessException("名称不能为空");
+        }
         if (record.getId() != null) {
             Partner orig = partnerRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);

src/test/java/com/izouma/uwip/web/LogoPatentControllerTest.java

@@ -0,0 +1,18 @@
+package com.izouma.uwip.web;
+
+import com.izouma.uwip.ApplicationTests;
+import com.izouma.uwip.dto.PageQuery;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public class LogoPatentControllerTest extends ApplicationTests {
+
+    @Autowired
+    private LogoPatentController logoPatentController;
+
+    @Test
+    public void all() {
+        logoPatentController.all(new PageQuery());
+    }
+}