Przeglądaj źródła

feat: ignore prodIds

shc 11 miesięcy temu
rodzic
commit
afeac7e3c4

+ 2 - 2
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SysUserDTO.java

@@ -86,10 +86,10 @@ public final class SysUserDTO {
     @Data
     public static class OnProdBind {
 
-        @NotNull(message = "业务员备案ID必填")
+        // @NotNull(message = "业务员备案ID必填")
         private Integer certId;
 
-        @NotEmpty(message = "商品ID必填")
+        // @NotEmpty(message = "商品ID必填")
         private List<Integer> productIds;
 
         @NotNull(message = "业务员ID必填")

+ 2 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -717,7 +717,8 @@ public class SysUserController {
             return R.failed("空报表,不能上传");
         }
 
-        Map<String, List<CommonUserDTO>> collect = commonUserExcelModelList.stream().map(commonUserExcelModel ->
+        Map<String, List<CommonUserDTO>> collect = commonUserExcelModelList.stream()
+                .filter(commonUserExcelModel -> StrUtil.isNotBlank(commonUserExcelModel.getUsername())).map(commonUserExcelModel ->
                 BeanUtil.copyProperties(commonUserExcelModel, CommonUserDTO.class)
         ).collect(Collectors.groupingBy(CommonUserDTO::getUsername));
 

+ 6 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysUserManager.java

@@ -101,10 +101,12 @@ public class SysUserManager {
      */
     public Boolean bindProdToUserCert(SysUserDTO.OnProdBind resource, HnqzUser user) {
 
-        String products = resource.getProductIds().stream().map(Objects::toString).collect(Collectors.joining(","));
-        userCertificateService.update(Wrappers.<SysUserCertificate>lambdaUpdate()
-                .set(SysUserCertificate::getProducts, products)
-                .eq(SysUserCertificate::getCertificateId, resource.getCertId()));
+        if (CollUtil.isNotEmpty(resource.getProductIds())) {
+            String products = resource.getProductIds().stream().map(Objects::toString).collect(Collectors.joining(","));
+            userCertificateService.update(Wrappers.<SysUserCertificate>lambdaUpdate()
+                    .set(SysUserCertificate::getProducts, products)
+                    .eq(SysUserCertificate::getCertificateId, resource.getCertId()));
+        }
 
         // 启用业务员
         userService.update(Wrappers.<SysUser>lambdaUpdate()