Merge remote-tracking branch 'origin/master'

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -108,4 +108,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	List<DictBiz> getCarrierTypeByDict();
 
 	void batchDestroyByIds(@Param("ids")List<String> ids);
+
+	String getUserRoleName(@Param("projectId")Long projectId,@Param("contractId") Long contractId,@Param("userId") Long userId);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -183,6 +183,9 @@
         <if test="vo.projectId != null and vo.projectId != ''">
             and matc.project_id = #{vo.projectId}
         </if>
+        <if test="vo.contractId != null and vo.contractId != ''">
+            and uaa.contract_id = #{vo.contractId}
+        </if>
         <if test="vo.searchType == 1 and vo.queryValue != null and vo.queryValue != ''">
             and uaa.name like concat('%',#{vo.queryValue},'%')
         </if>
@@ -231,6 +234,9 @@
         </foreach>
         ) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id = uaf.archive_id
         where uaa.is_deleted = 0
+        <if test="vo.contractId != null and vo.contractId != ''">
+            and uaa.contract_id = #{vo.contractId}
+        </if>
         <if test="vo.searchType == 1 and vo.queryValue != null and vo.queryValue != ''">
             and uaa.name like concat('%',#{vo.queryValue},'%')
         </if>
@@ -311,6 +317,14 @@
     <select id="getCarrierTypeByDict" resultType="org.springblade.system.entity.DictBiz">
         SELECT * FROM blade_dict_biz WHERE code = 'storage_type' AND  parent_id > 0 AND tenant_id = 000000
     </select>
+    <select id="getUserRoleName" resultType="java.lang.String">
+        SELECT br.role_name
+        FROM blade_role br
+        WHERE br.id = (
+            SELECT role_id  FROM m_project_assignment_user
+            WHERE project_id = #{projectId} AND contract_id = #{contractId} AND user_id = #{userId}
+        )
+    </select>
 
 
     <update id="splitFiles" >

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -100,11 +100,11 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
 
         DataVO dataVO = FormulaUtil.convertCellToIndex("C2");
         String key =  "1__"+ dataVO.getY() + "_" + dataVO.getX();
-        DataInfo.put(key,"档号123456");
+        DataInfo.put(key,"档号12345688888888888888888888888888888888888888888888888888888888888");
 
         DataVO dataVO1 = FormulaUtil.convertCellToIndex("A9");
         String key1 =  "2__"+ dataVO1.getY() + "_" + dataVO1.getX();
-        DataInfo.put(key1,"hahahahaa");
+        DataInfo.put(key1,"hahahahaa9999999999999999999999999999999999999999999999999999999999999");
         try {
             String url = getBussPdfInfo(pkeyId.toString(),DataInfo,excelUrl,file_path,null,null);
         } catch (Exception e) {
@@ -565,6 +565,13 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
                         if (row != null) {
                             Cell cell = row.getCell(x1 );
                             if (cell != null || ObjectUtils.isNotEmpty(cell)) {
+//                                boolean bflag = true;
+//                                if (bflag) {
+//                                    CellStyle newStyle = workbook.createCellStyle();//创建单元格样式
+//                                    newStyle.cloneStyleFrom(cell.getCellStyle());
+//                                    newStyle.setWrapText(true);
+//                                    cell.setCellStyle(newStyle);
+//                                }
                                 cell.setCellValue(myData);
                             }
                         }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -124,10 +124,19 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			vo.setCarrierTypes(Arrays.asList(vo.getCarrierType().split(",")));
 		}
 		List<ArchivesAutoVO> archivesAutos = null;
-		if (StringUtils.isNotBlank(vo.getNodeIds())){
+		//获取合同段类型
+		ContractInfo contractInfo = contractClient.getContractById(vo.getContractId());
+		Integer contractType = contractInfo.getContractType();
+		//根据用户在当前合同段的权限，判断返回
+		BladeUser user = AuthUtil.getUser();
+		String name = baseMapper.getUserRoleName(vo.getProjectId(),vo.getContractId(),user.getUserId());
+		if (name.contains("超级管理员") || contractType == 3) {
+			vo.setContractId(null);
+		}
+		if (StringUtils.isNotBlank(vo.getNodeIds())) {
 			vo.setNodeIdArray(Arrays.asList(vo.getNodeIds().split(",")));
 			archivesAutos = baseMapper.pageByArchivesAuto2(page, vo);
-		}else {
+		} else {
 			archivesAutos = baseMapper.pageByArchivesAuto(page, vo);
 		}
 		if (archivesAutos != null && archivesAutos.size() >0) {