Merge remote-tracking branch 'origin/dev/20220228_v3.0.1通用版_渠道管理第一期' into dev/20220228_v3.0.1通用版_渠道管理第一期

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -227,7 +227,9 @@ public class ColumnVerifyManagementFacade {
                 regularMapping.setColumnId(columnId);
                 regularMapping.setGmtCreate(new Date());
                 regularMapping.setGmtModified(new Date());
-                regularMapping.setCreator(principleId.toString());
+                if(principleId!=null) {
+                    regularMapping.setCreator(principleId.toString());
+                }
                 regularMapping.setRegularId(addColumnVerifyVO.getRegularId());
                 try {
                     regularMappingFacade.getBaseMapper().insert(regularMapping);
@@ -242,7 +244,9 @@ public class ColumnVerifyManagementFacade {
                 columnVerify.setDescription(addColumnVerifyVO.getDescription());
                 columnVerify.setGmtCreate(new Date());
                 columnVerify.setGmtModified(new Date());
-                columnVerify.setCreator(principleId.toString());
+                if(principleId!=null) {
+                    columnVerify.setCreator(principleId.toString());
+                }
                 try {
                     columnVerifyFacade.getBaseMapper().insert(columnVerify);
                 } catch (Exception e) {
@@ -263,7 +267,9 @@ public class ColumnVerifyManagementFacade {
                 nonnullInfo.setColumnId(columnId);
                 nonnullInfo.setGmtCreate(new Date());
                 nonnullInfo.setGmtModified(new Date());
-                nonnullInfo.setCreator(principleId.toString());
+                if(principleId!=null) {
+                    nonnullInfo.setCreator(principleId.toString());
+                }
                 nonnullInfo.setIsRequired(addColumnVerifyVO.getIsRequired());
                 try {
                     nonnullInfoFacade.getBaseMapper().insert(nonnullInfo);
@@ -278,7 +284,9 @@ public class ColumnVerifyManagementFacade {
                 columnVerify.setDescription(addColumnVerifyVO.getDescription());
                 columnVerify.setGmtCreate(new Date());
                 columnVerify.setGmtModified(new Date());
-                columnVerify.setCreator(principleId.toString());
+                if(principleId!=null) {
+                    columnVerify.setCreator(principleId.toString());
+                }
                 try {
                     columnVerifyFacade.getBaseMapper().insert(columnVerify);
                 } catch (Exception e) {
@@ -293,7 +301,9 @@ public class ColumnVerifyManagementFacade {
                     standardvalueInfo.setColumnId(columnId);
                     standardvalueInfo.setGmtCreate(new Date());
                     standardvalueInfo.setGmtModified(new Date());
-                    standardvalueInfo.setCreator(principleId.toString());
+                    if(principleId!=null) {
+                        standardvalueInfo.setCreator(principleId.toString());
+                    }
                     standardvalueInfo.setVal(standardValue);
                     try {
                         standardvalueInfoFacade.getBaseMapper().insert(standardvalueInfo);
@@ -308,7 +318,9 @@ public class ColumnVerifyManagementFacade {
                     columnVerify.setDescription(addColumnVerifyVO.getDescription());
                     columnVerify.setGmtCreate(new Date());
                     columnVerify.setGmtModified(new Date());
-                    columnVerify.setCreator(principleId.toString());
+                    if(principleId!=null) {
+                        columnVerify.setCreator(principleId.toString());
+                    }
                     try {
                         columnVerifyFacade.getBaseMapper().insert(columnVerify);
                     } catch (Exception e) {
@@ -481,7 +493,9 @@ public class ColumnVerifyManagementFacade {
                         RegularMapping regularMapping = new RegularMapping();
                         regularMapping.setColumnId(columnId);
                         regularMapping.setGmtCreate(new Date());
-                        regularMapping.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            regularMapping.setCreator(principleId.toString());
+                        }
                         regularMapping.setRegularId(updateColumnVerifyVO.getRegularId());
                         try {
                             regularMappingFacade.getBaseMapper().insert(regularMapping);
@@ -495,7 +509,9 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setVerifyVal(updateColumnVerifyVO.getRegularName());
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
-                        columnVerify.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            columnVerify.setCreator(principleId.toString());
+                        }
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {
@@ -534,7 +550,9 @@ public class ColumnVerifyManagementFacade {
                         NonnullInfo nonnullInfo = new NonnullInfo();
                         nonnullInfo.setColumnId(columnId);
                         nonnullInfo.setGmtCreate(new Date());
-                        nonnullInfo.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            nonnullInfo.setCreator(principleId.toString());
+                        }
                         nonnullInfo.setIsRequired(updateColumnVerifyVO.getIsRequired());
                         try {
                             nonnullInfoFacade.getBaseMapper().insert(nonnullInfo);
@@ -548,7 +566,9 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setVerifyVal(updateColumnVerifyVO.getIsRequired());
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
-                        columnVerify.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            columnVerify.setCreator(principleId.toString());
+                        }
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {
@@ -573,7 +593,9 @@ public class ColumnVerifyManagementFacade {
                         standardvalueInfo.setGmtCreate(new Date());
                         standardvalueInfo.setGmtModified(new Date());
                         standardvalueInfo.setVal(standardValue);
-                        standardvalueInfo.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            standardvalueInfo.setCreator(principleId.toString());
+                        }
                         try {
                             standardvalueInfoFacade.getBaseMapper().insert(standardvalueInfo);
                         } catch (Exception e) {
@@ -587,7 +609,9 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
                         columnVerify.setGmtModified(new Date());
-                        columnVerify.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            columnVerify.setCreator(principleId.toString());
+                        }
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {