Merge remote-tracking branch 'origin/master'

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyPerformanceAppraisalServiceImpl.java

@@ -448,7 +448,7 @@ public class AspSafetyPerformanceAppraisalServiceImpl extends ServiceImpl<AspSaf
                     detail.setMainid(id);
                     detail.setId(SecurityUtil.getUUID());
 
-                    /*detail.setCreateusername(currentUser.getName());
+                    detail.setCreateusername(currentUser.getName());
                     detail.setCreateuserid(currentUser.getId());
                     detail.setModifyusername(currentUser.getName());
                     detail.setModifyuserid(currentUser.getId());
@@ -456,7 +456,7 @@ public class AspSafetyPerformanceAppraisalServiceImpl extends ServiceImpl<AspSaf
                     detail.setModifydate(date);
                     //获取当前用户的tenantId
 //                  detail.setTenantid(currentUser.getTenantid());
-                    detail.setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);*/
+                    detail.setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
 
                     res.add(detail);
                 } else {