Explorar el Código

fix: 查询药店根据名称查询重复问题2

lixuesong hace 1 año
padre
commit
efb51feb82

+ 5 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -2547,10 +2547,7 @@ public class ApiController {
 						// 查询适配, 普通药店和连锁药房统一返回33
 						if ("3".equals(userSign.getSignEntType())) {
 							// 根据药店类型 区分任务类型33-普通药店/73-连锁药房
-							WmDaPharmacy daPharmacy = wmDaPharmacyService.getOne(Wrappers.<WmDaPharmacy>lambdaQuery()
-									.eq(WmDaPharmacy::getPharmacyName, userSign.getSignEntName())
-									.eq(WmDaPharmacy::getDelFlag, DelEnum.NOT_DEL.val())
-									.eq(WmDaPharmacy::getEnableFlag, EnableEnum.ENABLE.val()));
+							WmDaPharmacy daPharmacy = wmDaPharmacyService.getById(userSign.getSignEntId());
 							if (daPharmacy == null) {
 								throw new BizException("药店不存在或已停用");
 							}
@@ -3072,6 +3069,10 @@ public class ApiController {
 		List<WmScorePackageStatus> statusList = wmScorePackageStatusService.
 				list(Wrappers.query(wmScorePackageStatus));
 
+		if (CollUtil.isEmpty(statusList)) {
+			return R.ok(Collections.emptyList());
+		}
+
 		List<Map<String, Object>> listMap = new ArrayList<>();
 
 		// 获取领包记录对应的积分包ID && 获取积分包信息