Merge branch 'han' of uskycloud/usky-modules into master

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyServiceImpl.java

@@ -901,6 +901,8 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
             baseCompany.setCompanyId(uuidStr.replaceAll("-",""));
             baseCompany.setCompanyType("1");
             baseCompany.setEnable("0");
+            baseCompany.setCreateTime(LocalDateTime.now());
+            baseCompany.setCreator(companyAddVO.getBaseCompanyPerson().getFireManageName());
             this.save(baseCompany);
             baseCompanyAttach1.setCompanyId(uuidStr.replaceAll("-",""));
             baseCompanyAttach1Service.save(baseCompanyAttach1);
@@ -911,7 +913,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                     BaseBuild baseBuild;
                     baseBuild = list.get(j);
                     baseBuild.setCreateTime(LocalDateTime.now());
-                    baseBuild.setCreator("123");
+                    baseBuild.setCreator(companyAddVO.getBaseCompanyPerson().getFireManageName());
                     baseBuild.setCompanyId(uuidStr.replaceAll("-",""));
                     baseBuild.setDeleteFlag("0");
                     baseBuildService.save(baseBuild);