Merge remote-tracking branch 'origin/master'

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -386,7 +386,7 @@ public class ArchivesAutoController extends BladeController {
 				isArchivesAuto = contract.getIsArchivesAuto();
 				if( isArchivesAuto==0){
 					isArchivesAuto=100;
-				}else if (isArchivesAuto==-1 || isArchivesAuto==null) {
+				}else if (isArchivesAuto==null || isArchivesAuto==-1 ) {
 					isArchivesAuto=0;
 				}
 			}

blade-service/blade-control/src/main/java/org/springblade/control/controller/DictInfoController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.control.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -84,13 +85,13 @@ public class DictInfoController extends BladeController {
             }
         }
 
-        Long userCount = dictInfoService.getBaseMapper().selectCount(
-                Wrappers.<DictInfo>query().lambda()
+        DictInfo dictInfoOne = dictInfoService.getOne(new LambdaQueryWrapper<DictInfo>()
                         .eq(DictInfo::getDictName, dictInfo.getDictName())
                         .eq(DictInfo::getType, dictInfo.getType())
                         .eq(DictInfo::getIsDeleted, 0));
-        if(userCount>=1){
-            return R.success("数据已存在,请勿重复添加");
+
+        if(dictInfoOne !=null && StringUtil.isNotBlank(dictInfoOne.getId()+"")) {
+            dictInfoOne.setId(dictInfoOne.getId());
         }
 
         CacheUtil.clear(DICT_CACHE, Boolean.FALSE);

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/PlanInformServiceImpl.java

@@ -83,10 +83,10 @@ public class PlanInformServiceImpl extends BaseServiceImpl<PlanInformMapper, Pla
      */
     @Override
     public void taskFinishedInform2(String taskName, String taskUser, String appUserName,Integer status) {
-        StringBuilder str = new StringBuilder();
         String[] split = taskUser.split(",");
         List<PlanInform> list = new ArrayList<>();
         for (String s : split) {
+            StringBuilder str = new StringBuilder();
             str.append("【" + appUserName + "】" + "向您发起《"+taskName+"》审批");
             PlanInform inform = new PlanInform();
             inform.setInformDetails(str.toString());