From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
index 3388775..cc3a750 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
@@ -37,7 +38,8 @@
*/
@ApiOperation("鏌ヨ鐢ㄦ埛鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:info:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody BaseUserInfo baseUserInfo) {
startPage();
List<BaseUserInfo> list = baseUserInfoService.selectBaseUserInfoList(baseUserInfo);
@@ -73,10 +75,9 @@
@ApiOperation("鏂板鐢ㄦ埛")
//@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody BaseUserInfo baseUserInfo) {
- SysUser user = getLoginUser().getUser();
- baseUserInfo.setOrgid(user.getOrgid());
return toAjax(baseUserInfoService.insertBaseUserInfo(baseUserInfo));
}
@@ -86,7 +87,8 @@
@ApiOperation("淇敼鐢ㄦ埛")
//@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseUserInfo baseUserInfo) {
return toAjax(baseUserInfoService.updateBaseUserInfo(baseUserInfo));
}
@@ -110,6 +112,7 @@
* @return
*/
@ApiOperation("鑾峰彇浜哄憳鐨勮仈绯绘柟寮�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@GetMapping("/reportContent")
public AjaxResult getContact(@RequestParam("personCode") String personCode, @RequestParam("noticeWay") String noticeWay) {
if (StringUtils.isEmpty(personCode) || StringUtils.isEmpty(noticeWay)) {
--
Gitblit v1.9.3