From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
index 1b9f686..d8a2672 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -266,7 +266,7 @@
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "state", required = false) String state)
{
- return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",null);
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"0",null);
}
@@ -282,7 +282,7 @@
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "merchantId", required = false) String merchantId)
{
- return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"2",merchantId);
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",merchantId);
}
@@ -294,6 +294,11 @@
@PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
{
+ if(StringUtils.isEmpty(vimVO.getMerchantId()))
+ {
+ return R.fail("商家id不能为空");
+ }
+
vimVO.setGoodType("1");
return volunteerActivitiesPeople.VolunteerIntegralMerchantInsertVolunteer(vimVO);
}
@@ -301,6 +306,11 @@
@PostMapping("/VolunteerIntegralMerchant/updateById")
public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
{
+ if(StringUtils.isEmpty(vimVO.getMerchantId()))
+ {
+ return R.fail("商家id不能为空");
+ }
+
vimVO.setGoodType("1");
return volunteerActivitiesPeople.VolunteerIntegralMerchantUpdateById(vimVO);
}
--
Gitblit v1.7.1