电签相关

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -231,7 +231,7 @@ public class EVisaServiceImpl implements EVisaService {
                         if(eVisaConfig.getString("type").equals(next.getPfxType())){
                             //设置签章策略
                             SealStrategyVO vo = new SealStrategyVO();
-                            vo.setSealCode(EVisaConstant.SIGN_SEAL_CODE + next.getCertificatePassword());
+                            vo.setSealCode(EVisaConstant.SIGN_SEAL_CODE + next.getId());
                             vo.setSealPassword(next.getCertificatePassword());
                             vo.setSealPerson(next.getCertificateUserName() + System.currentTimeMillis());
                             //设置签字文件
@@ -667,7 +667,7 @@ public class EVisaServiceImpl implements EVisaService {
                 return responseHeadBean.getMessage();
             } else if(responseHeadBean.getMessage().contains("is exist")) {
                 logger.info("【电签模块】{}", responseHeadBean.getMessage());
-                return "successfully";
+                return "error";
             }
         }catch (Exception e){
             e.printStackTrace();

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/SignPfxClientImpl.java

@@ -19,10 +19,10 @@ public class SignPfxClientImpl implements SignPfxClient {
 
         if(StringUtils.isNotEmpty(userId)){
             //查询个人章
-            return this.signPfxFileService.list(Wrappers.<SignPfxFile>lambdaQuery().eq(SignPfxFile::getCertificateUserId, userId));
+            return this.signPfxFileService.list(Wrappers.<SignPfxFile>lambdaQuery().eq(SignPfxFile::getIsRegister, "1").eq(SignPfxFile::getCertificateUserId, userId));
         } else if(StringUtils.isNotEmpty(contractId)){
             //查询项目章
-            return this.signPfxFileService.list(Wrappers.<SignPfxFile>lambdaQuery().like(SignPfxFile::getProjectContractRole, contractId));
+            return this.signPfxFileService.list(Wrappers.<SignPfxFile>lambdaQuery().eq(SignPfxFile::getIsRegister, "1").like(SignPfxFile::getProjectContractRole, contractId));
         }
         return null;
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/SignPfxFileServiceImpl.java

@@ -142,7 +142,7 @@ public class SignPfxFileServiceImpl extends BaseServiceImpl<SignPfxFileMapper, S
 				//证书密码
 				makeSeal.setPfxPassword(singPfx.getCertificatePassword());
 				//构造seal码
-				makeSeal.setSealCode(EVisaConstant.SIGN_SEAL_CODE + singPfx.getCertificatePassword());
+				makeSeal.setSealCode(EVisaConstant.SIGN_SEAL_CODE + id);
 				//构建seal名
 				makeSeal.setSealName(EVisaConstant.SIGN_SEAL_NAME + singPfx.getCertificatePassword());
 				makeSeal.setSealPassword(singPfx.getCertificatePassword());