fixed issues about create new db

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java

@@ -2609,42 +2609,42 @@ public class OrganizationServiceImpl implements OrganizationService {
 //            addLogList.add(updateLogParams);
 //        }
 
-        for (OrganizationServiceTemplateGroup item : updates) {
-            OrganizationServiceTemplateGroup current = currentList.stream()
-                    .filter(sa -> Strings.equals(sa.getServiceTypeId(), item.getServiceTypeId())).findFirst()
-                    .orElse(null);
-            if (current != null) {
-                ServiceType tService = queryService.stream()
-                        .filter(sa -> Strings.equals(sa.getID(), item.getServiceTypeId())).findFirst().orElse(null);
-                Assert.notNull(tService, "tService null exception in updateOrganizationServiceTemplateGroupLog");
-                String serviceName = tService.getName();
-
-                TemplateGroup updateTemplate = queryTemplate.stream()
-                        .filter(sa -> Long.compare(sa.getId(), item.getTemplateGroupId())==0).findFirst().orElse(null);
-                Assert.notNull(updateTemplate,
-                        "updateTemplate null exception in updateOrganizationServiceTemplateGroupLog");
-                String updateStr = updateTemplate.getName();
-
-                TemplateGroup currentTemplate = queryTemplate.stream()
-                        .filter(sa -> Long.compare(sa.getId(), current.getTemplateGroupId())==0).findFirst()
-                        .orElse(null);
-                Assert.notNull(currentTemplate,
-                        "currentTemplate null exception in updateOrganizationServiceTemplateGroupLog");
-                String currentStr = currentTemplate.getName();
-
-                UpdateLogParams updateLogParams = new UpdateLogParams();
-                updateLogParams.setUpdateState(updateStr);
-                updateLogParams.setOriginalState(currentStr);
-                updateLogParams.setOperationContent(OrganizationMessage.OrganizationServiceTemplateGroup);
-                updateLogParams.setOperationObject(operateObject + DashSignSeparator + serviceName);
-                updateLogParams.setOperationModule(OperationModule.Organization.value());
-                updateLogParams.setOperateLogType(OperateLogType.OperationLogOrganization.value());
-                updateLogParams.setComment("");
-                updateLogParams.setOperationAction(OperationAction.Update.value());
-                addLogList.add(updateLogParams);
-            }
-
-        }
+//        for (OrganizationServiceTemplateGroup item : updates) {
+//            OrganizationServiceTemplateGroup current = currentList.stream()
+//                    .filter(sa -> Strings.equals(sa.getServiceTypeId(), item.getServiceTypeId())).findFirst()
+//                    .orElse(null);
+//            if (current != null) {
+//                ServiceType tService = queryService.stream()
+//                        .filter(sa -> Strings.equals(sa.getID(), item.getServiceTypeId())).findFirst().orElse(null);
+//                Assert.notNull(tService, "tService null exception in updateOrganizationServiceTemplateGroupLog");
+//                String serviceName = tService.getName();
+//
+//                TemplateGroup updateTemplate = queryTemplate.stream()
+//                        .filter(sa -> Long.compare(sa.getId(), item.getTemplateGroupId())==0).findFirst().orElse(null);
+//                Assert.notNull(updateTemplate,
+//                        "updateTemplate null exception in updateOrganizationServiceTemplateGroupLog");
+//                String updateStr = updateTemplate.getName();
+//
+//                TemplateGroup currentTemplate = queryTemplate.stream()
+//                        .filter(sa -> Long.compare(sa.getId(), current.getTemplateGroupId())==0).findFirst()
+//                        .orElse(null);
+//                Assert.notNull(currentTemplate,
+//                        "currentTemplate null exception in updateOrganizationServiceTemplateGroupLog");
+//                String currentStr = currentTemplate.getName();
+//
+//                UpdateLogParams updateLogParams = new UpdateLogParams();
+//                updateLogParams.setUpdateState(updateStr);
+//                updateLogParams.setOriginalState(currentStr);
+//                updateLogParams.setOperationContent(OrganizationMessage.OrganizationServiceTemplateGroup);
+//                updateLogParams.setOperationObject(operateObject + DashSignSeparator + serviceName);
+//                updateLogParams.setOperationModule(OperationModule.Organization.value());
+//                updateLogParams.setOperateLogType(OperateLogType.OperationLogOrganization.value());
+//                updateLogParams.setComment("");
+//                updateLogParams.setOperationAction(OperationAction.Update.value());
+//                addLogList.add(updateLogParams);
+//            }
+//
+//        }
         operationLogService.addOrDeleteDataAddLog(addLogList);
     }
 

atms-api/src/main/resources/RuntimeDbScripts/MYSQL/CreateProjectDB.sql

@@ -1122,7 +1122,7 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`modified_report_cell` (
    `create_by` varchar(128) NOT NULL,
    `update_by` varchar(128) NOT NULL,
    PRIMARY KEY (`id`)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 Insert INTO EnterpriseAccount
 SELECT