Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import lombok.extern.slf4j.Slf4j;
@@ -57,7 +58,8 @@ public class NoRepeatSubmitAop {
                     //因为getLock如果获取失败抛异常 所以不做锁状态的判断
                 }
             } catch (Exception e) {
-                log.warn("noRepeatSubmit key:{},msg:{}", key, e.getMessage());
+                String error = ExceptionUtils.getErrorStackTrace(e);
+                log.warn("noRepeatSubmit key:{},msg:{}", key, error);
                 //"未获取到锁，重复提交了
                 throw new RenException(EpmetErrorCode.REPEAT_SUBMIT.getCode());
             }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java

@@ -87,7 +87,7 @@ public class EditAgencyFormDTO implements Serializable {
      */
     private String parentAreaCode;
 
-    @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddUserInternalGroup.class)
+    @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddAgencyV2FormDTO.AddUserInternalGroup.class)
     private String level;
 
     //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填