修复主管部门岗位变动可以合并申报bug

ruoyi-process/src/main/java/com/ruoyi/process/declaration/service/impl/DeclarationServiceImpl.java

@@ -1322,7 +1322,7 @@ public class DeclarationServiceImpl implements IDeclarationService {
             DeclarationVo declarationVo = declarationMapper.selectDeclarationById(p);
             declarationVo.setParentId(parentId.toString());
             //人事综合管理部门合并申报时生成确认函承办签
-            if(UserEnums.roleType.zhglbmczy.getId().equals(ShiroUtils.getSysUser().getRoleId())){
+            if(UserEnums.roleType.zhglbmczy.getId().equals(ShiroUtils.getSysUser().getRoleId().toString())){
                 String attachment = declarationVo.getAttachment();
                 attachment = FileUtils.AddJsonUrl(attachment, FlowTypeEnums.FileName.CBQ.getStatus(), attachmentCBQ);
                 attachment = FileUtils.AddJsonUrl(attachment, FlowTypeEnums.FileName.BDQRH.getStatus(), attachmentBDQRH);