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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java

@@ -108,17 +108,22 @@ public class QiyuesuoController extends BaseController {
 	@PostMapping(value = "/getContractTokengz/{sequenceNbr}")
 	public ResponseModel<Object> getContractSdkResponseSequenceNbr(@RequestBody ContractMiniappTicketRequest request,
 			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
-		queryWrapper.eq("amos_company_seq", sequenceNbr);
-		List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
-		if(CollectionUtils.isNotEmpty(sealDictionaryList)){
-			request.setUser(new User(sealDictionaryList.get(0).getSealedPhone(), "MOBILE"));
-		}
+		SealDictionary sealDictionary = sealDictionaryMapper.selectById(sequenceNbr);
+		request.setUser(new User(sealDictionary.getSealedPhone(), "MOBILE"));
 		SdkResponse<MiniappTicketResult> result = qiyuesuoService.getContractSdkResponse(request);
 		return ResponseHelper.buildResponse(result.getResult());
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "获取所有盖章人员", notes = "获取所有盖章人员")
+	@GetMapping(value = "/getAllUserByCompanySeq")
+	public ResponseModel<List<SealDictionary>> getAll(@RequestParam(value = "companySeq") Long companySeq) {
+		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
+		queryWrapper.eq("amos_company_seq", companySeq);
+		return ResponseHelper.buildResponse(sealDictionaryMapper.selectList(queryWrapper));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "获取合同浏览令牌", notes = "获取合同浏览令牌")
 	@GetMapping(value = "/getContractTokenTicket/{sequenceNbr}")
 	public ResponseModel<Object> getContractTokenTicket(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {