Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -3096,12 +3096,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
                 }else{
                     hashMap.put("code","2");
-                    hashMap.put("message","查询不到江苏兴光项目管理有限公司公章 的印章信息！请联系管理员");
+                    hashMap.put("message","查询不到江苏兴光会计事务所公章 的印章信息！请联系管理员");
                     return hashMap;
                 }
             }else{
                 hashMap.put("code","2");
-                hashMap.put("message","查询不到江苏兴光项目管理有限公司公章 的印章信息！请联系管理员");
+                hashMap.put("message","查询不到江苏兴光会计事务所公章 的印章信息！请联系管理员");
                 return hashMap;
             }
         }else{

jeeplus-modules/jeeplus-finance/src/main/resources/application-finance-development.yml

@@ -43,6 +43,8 @@ judgement_category_id: 2920938119742709765
 approval_YC_category_id: 2932214418853044239
 #报告用印流程id(盐城)
 report_YC_category_id: 2933233458312618324
+#会计公司圆章
+company_round_seal_finance_id: 3050351578005561392
 
 #验证码发送相关参数
 rong_userid: 8a216da86715511501673e331c24171e

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/MyNoticeService.java

@@ -97,7 +97,7 @@ public class MyNoticeService {
         if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())){
             for (RoleDTO roleDTO : userDTO.getRoleDTOList()) {
                 RoleDTO dtoById = SpringUtil.getBean(IRoleApi.class).getRoleDTOById(roleDTO.getId());
-                if ("szbgqzgzdb".equals(dtoById.getEnName())){
+                if (null != dtoById && "szbgqzgzdb".equals(dtoById.getEnName())){
                     listPage = mapper.selectNoticePage3(page, queryWrapper);
                 }
             }