Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1306,7 +1306,7 @@ public class DeclarationServiceImpl implements IDeclarationService {
         //人事综合管理部门合并申报时生成确认函承办签
         String attachmentCBQ = "";
         String attachmentBDQRH = "";
-        if(UserEnums.roleType.zhglbmczy.getId().equals(ShiroUtils.getSysUser().getRoleId())){
+        if(RoleConstants.ROLE_RSZHGLBM_CZY.equals(ShiroUtils.getSysUser().getRoleId())){
             //得到生成word需要的数据;
             Map map = generateParameterList(sysDept, declarationIdList);
             attachmentCBQ = generateFile("来文承办签.docx", map, sysDept.getDeptName(), DateUtils.datePath() + "/" + parentId.toString());
@@ -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(RoleConstants.ROLE_RSZHGLBM_CZY.equals(ShiroUtils.getSysUser().getRoleId())){
                 String attachment = declarationVo.getAttachment();
                 attachment = FileUtils.AddJsonUrl(attachment, FlowTypeEnums.FileName.CBQ.getStatus(), attachmentCBQ);
                 attachment = FileUtils.AddJsonUrl(attachment, FlowTypeEnums.FileName.BDQRH.getStatus(), attachmentBDQRH);