Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.3

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookServiceImpl.java

@@ -52,7 +52,7 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
         } else {
             page = new Page<>();
         }
-        SysOrg org = orgService.selectOrgById(coreSafetyBook.getOrgId() != null ? coreSafetyBook.getOrgId() : SecurityUtils.getUserId(), SecurityConstants.INNER);
+        SysOrg org = orgService.selectOrgById(coreSafetyBook.getOrgId() != null ? coreSafetyBook.getOrgId() : SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
         if (org != null) {
             coreSafetyBook.setSelectOrgPath(org.getPath());
         }
@@ -76,9 +76,9 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
             coreSafetyBook.setCreateTime(new Date());
             coreSafetyBook.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
             coreSafetyBook.setCreateOrgId(SecurityUtils.getLoginUser().getOrgId());
-            Year year = Year.now();
-            int currentYear = year.getValue();
-            coreSafetyBook.setYear((long) currentYear);
+//            Year year = Year.now();
+//            int currentYear = year.getValue();
+//            coreSafetyBook.setYear((long) currentYear);
             baseMapper.insert(coreSafetyBook);
         }
         //处理签署信息