Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/system/SysProcurementStandardController.java

@@ -1,12 +1,17 @@
 package com.ozs.web.controller.system;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ozs.common.core.domain.R;
 import com.ozs.common.core.domain.entity.SysProcurementStandard;
+import com.ozs.common.core.domain.entity.SysRole;
+import com.ozs.plan.doman.MonthlyReconciliation;
 import com.ozs.system.domain.vo.requestVo.SysProcurementStandardVo;
 import com.ozs.system.service.SysProcurementStandardService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,9 +59,13 @@ public class SysProcurementStandardController {
     public R<String> update(@RequestBody List<SysProcurementStandardVo> sysProcurementStandardVoList) {
         boolean isSuccess = false;
         SysProcurementStandard sysProcurementStandard = new SysProcurementStandard();
+        LambdaQueryWrapper<SysProcurementStandard> lw = new LambdaQueryWrapper<>();
         for (SysProcurementStandardVo sysProcurementStandardVo : sysProcurementStandardVoList) {
             BeanUtils.copyProperties(sysProcurementStandardVo, sysProcurementStandard);
-            isSuccess = sysProcurementStandardService.updateById(sysProcurementStandard);
+            if(sysProcurementStandard.getProcurementStandardId()>-1L){
+                lw.eq(SysProcurementStandard::getProcurementStandardId,sysProcurementStandard.getProcurementStandardId());
+            }
+            isSuccess = sysProcurementStandardService.update(sysProcurementStandard,lw);
             if (!isSuccess) {
                 return R.fail();
             }

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysDictData.java

@@ -72,7 +72,7 @@ public class SysDictData extends BaseEntity
         this.dictSort = dictSort;
     }
 
-    @NotBlank(message = "字典标签不能为空")
+//    @NotBlank(message = "字典标签不能为空")
     @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
     public String getDictLabel()
     {
@@ -84,7 +84,7 @@ public class SysDictData extends BaseEntity
         this.dictLabel = dictLabel;
     }
 
-    @NotBlank(message = "字典键值不能为空")
+//    @NotBlank(message = "字典键值不能为空")
     @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
     public String getDictValue()
     {
@@ -96,7 +96,7 @@ public class SysDictData extends BaseEntity
         this.dictValue = dictValue;
     }
 
-    @NotBlank(message = "字典类型不能为空")
+//    @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
     public String getDictType()
     {