sagger 知识库api

java/storlead-api/pom.xml

@@ -46,6 +46,11 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+
         <!--        业务模块     -->
         <dependency>
             <groupId>com.storlead.boot</groupId>
@@ -83,6 +88,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.storlead.StorleadTradeApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

java/storlead-api/src/main/java/com/storlead/api/config/StorleadApiSwaggerConfig.java

@@ -0,0 +1,65 @@
+package com.storlead.api.config;
+
+import com.storlead.framework.common.constant.DefContants;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+import java.util.Set;
+
+/**
+ * storlead-api 启动模块专属接口文档分组（平台网关/登录/系统配置等）。
+ */
+@Configuration
+public class StorleadApiSwaggerConfig {
+
+    private static final Set<String> PLATFORM_CONTROLLER_NAMES = Set.of(
+            "LoginApiController",
+            "UserApiController",
+            "UserController",
+            "FileResourceController",
+            "OrganizDataSyncApiController",
+            "SystemSettingApiController",
+            "SystemPersonalizeSettingApiController",
+            "SystemOssConfigApiController",
+            "SystemWechatConfigApiController",
+            "CorpWeChatController"
+    );
+
+    @Bean
+    public Docket storleadApiDocket() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("platform-api")
+                .apiInfo(platformApiInfo())
+                .select()
+                .apis(input -> {
+                    Class<?> controllerType = input.getHandlerMethod().getBeanType();
+                    String pkg = controllerType.getPackage().getName();
+                    if (pkg.startsWith("com.storlead.login")) {
+                        return true;
+                    }
+                    if ("com.storlead.system".equals(pkg)) {
+                        return true;
+                    }
+                    return pkg.startsWith("com.storlead.system.controller")
+                            && PLATFORM_CONTROLLER_NAMES.contains(controllerType.getSimpleName());
+                })
+                .paths(PathSelectors.any())
+                .build()
+                .securitySchemes(java.util.Collections.singletonList(
+                        new ApiKey("token", DefContants.ACCESS_TOKEN, "header")));
+    }
+
+    private ApiInfo platformApiInfo() {
+        return new ApiInfoBuilder()
+                .title("平台网关 API（storlead-api）")
+                .description("storlead-api 模块：登录认证、租户登录、验证码、OSS/微信/个性化配置等")
+                .version("1.0")
+                .build();
+    }
+}

java/storlead-api/src/main/java/com/storlead/login/AuthCaptchaApiController.java

@@ -38,7 +38,7 @@ public class AuthCaptchaApiController {
             return Result.error("不支持的场景: " + scene);
         }
         smsCaptchaService.sendCaptcha(mobile, s);
-        return Result.ok(smsCaptchaService.sendCaptcha(mobile, s));
+        return Result.result(smsCaptchaService.sendCaptcha(mobile, s));
     }
 
     @ApiOperation("校验验证码")
@@ -55,7 +55,7 @@ public class AuthCaptchaApiController {
         if (s == null) {
             return Result.error("不支持的场景: " + scene);
         }
-        return Result.ok(smsCaptchaService.verifyCaptcha(mobile, code, s, consume));
+        return Result.result(smsCaptchaService.verifyCaptcha(mobile, code, s, consume));
     }
 
     private static SmsCaptchaScene parseScene(String scene) {

java/storlead-api/src/main/java/com/storlead/login/TenantLoginApiController.java

@@ -162,7 +162,7 @@ public class TenantLoginApiController {
             obj.put("enterpriseId", enterprise.getId());
             @SuppressWarnings("unchecked")
             Map<String, Object> body = JSONObject.parseObject(obj.toJSONString(), Map.class);
-            return Result.ok(body);
+            return Result.result(body);
         } finally {
             TenantContext.setIgnoreTenantLine(false);
         }

java/storlead-api/src/main/java/com/storlead/system/CorpWeChatController.java

@@ -150,7 +150,7 @@ public class CorpWeChatController {
 //        Map<String, String> apiMap = new HashMap();
 //        redisService.setCacheObject(RedisKeySaltConstant.API_CODE_REDIS + loginUser.getMobile(), apiMap);
         obj.put("token", token);
-        return Result.ok(obj);
+        return Result.result(obj);
     }
 
 
@@ -226,7 +226,7 @@ public class CorpWeChatController {
         log.error("===redirectUrl-----"+redirectUrl);
         response.sendRedirect(redirectUrl);
 
-        return Result.ok(obj);
+        return Result.result(obj);
     }
 
     public boolean isMobile(HttpServletRequest request) {

java/storlead-api/src/main/java/com/storlead/system/controller/FileResourceController.java

@@ -352,7 +352,7 @@ public class FileResourceController {
 //    public Result deleteByPath(String filePathName) {
 //        // String filePathName = "group1/M00/00/00/wKhjZF3WEDmAPSglAABSZAhj0eU111.jpg" ;
 //        fileResourceService.deleteFile(filePathName);
-//        return Result.ok("删除成功");
+//        return Result.result("删除成功");
 //    }
 
 }

java/storlead-api/src/main/java/com/storlead/system/controller/LoginApiController.java

@@ -99,7 +99,7 @@ public class LoginApiController {
     @ResponseBody
     public Object redirect(HttpServletRequest request, HttpServletResponse response)  throws IOException {
         response.sendRedirect("http://www.baidu.com");
-        return Result.ok("");
+        return Result.result("");
     }
 
     @PostMapping(value = "/login")
@@ -210,7 +210,7 @@ public class LoginApiController {
         redisService.setCacheObject(RedisKeySaltConstant.API_CODE_REDIS + loginUser.getMobile(), apiMap);
 
         obj.put("token", token);
-        return Result.ok(obj);
+        return Result.result(obj);
     }
 
     @RequestMapping(value = "/ticket_login", method = RequestMethod.POST)
@@ -294,7 +294,7 @@ public class LoginApiController {
         redisService.setCacheObject(RedisKeySaltConstant.API_CODE_REDIS + loginUser.getMobile(), apiMap);
 
         obj.put("token", token);
-        return Result.ok(obj);
+        return Result.result(obj);
     }
 
     @ApiOperation("修改密码")
@@ -320,7 +320,7 @@ public class LoginApiController {
         }
         Boolean del = redisService.deleteObject(token);
         if (del) {
-            return Result.ok("退出登录成功！");
+            return Result.result("退出登录成功！");
         } else {
             Object obj = redisService.getCacheObject(token);
             if (obj == null) {
@@ -358,7 +358,7 @@ public class LoginApiController {
     }
 
     @RequestMapping(value = "/external_login", method = RequestMethod.POST)
-    @ApiOperation(value = "用户登录接口", notes = "用户登录接口")
+    @ApiOperation(value = "外部用户登录接口", notes = "外部用户登录接口")
     public Result externalLogin(@RequestBody UserLoginDTO loginDTO) {
 
         if (Objects.isNull(loginDTO)) {
@@ -421,7 +421,7 @@ public class LoginApiController {
         redisService.setCacheObject(RedisKeySaltConstant.API_CODE_REDIS + loginUser.getMobile(), apiMap);
 
         obj.put("token", token);
-        return Result.ok(obj);
+        return Result.result(obj);
     }
 
     @ApiOperation("获取当前用户信息")
@@ -457,7 +457,7 @@ public class LoginApiController {
         if (!CollectionUtils.isEmpty(userMenuList)) {
             loginUser.setBtnRes(userMenuList.stream().map(MenuEntity::getPerms).collect(Collectors.toSet()));
         }
-        return Result.ok(loginUser);
+        return Result.result(loginUser);
     }
 
     @ApiOperation("获取当前用户信息")
@@ -502,7 +502,7 @@ public class LoginApiController {
                     .collect(Collectors.toList());
             loginUser.setPermis(permis);
         }
-        return Result.ok(loginUser);
+        return Result.result(loginUser);
     }
 
     @ApiOperation("获取当前用户信息")
@@ -533,7 +533,7 @@ public class LoginApiController {
 //            loginUser.setDeptCode(dept.getRouteCode());
 //            loginUser.setDeptName(dept.getName());
 //        }
-        return Result.ok(loginUser);
+        return Result.result(loginUser);
     }
 
     @ApiOperation("获取AccessToken")

java/storlead-api/src/main/java/com/storlead/system/controller/SystemOssConfigApiController.java

@@ -4,6 +4,7 @@ import com.storlead.framework.common.result.Result;
 import com.storlead.system.pojo.entity.SystemOssConfigEntity;
 import com.storlead.system.pojo.entity.SystemPersonalizeSettingEntity;
 import com.storlead.system.service.SystemOssConfigService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
@@ -23,6 +24,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/sys/alioss/config")
+@Api(tags = "平台中心 - 系统: OSS配置")
 public class SystemOssConfigApiController {
 
     @Resource
@@ -45,6 +47,6 @@ public class SystemOssConfigApiController {
     })
     public Result<?> getSetting() {
         SystemOssConfigEntity alioss = systemOssConfigService.getOne(null);
-        return Result.ok(alioss);
+        return Result.result(alioss);
     }
 }

java/storlead-api/src/main/java/com/storlead/system/controller/SystemPersonalizeSettingApiController.java

@@ -4,6 +4,7 @@ package com.storlead.system.controller;
 import com.storlead.framework.common.result.Result;
 import com.storlead.system.pojo.entity.SystemPersonalizeSettingEntity;
 import com.storlead.system.service.SystemPersonalizeSettingService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
@@ -24,6 +25,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/sys/personalize/setting")
+@Api(tags = "平台中心 - 系统: 个性化设置")
 public class SystemPersonalizeSettingApiController {
 
     @Resource
@@ -47,6 +49,6 @@ public class SystemPersonalizeSettingApiController {
     })
     public Result<?> getSetting() {
         SystemPersonalizeSettingEntity setting = personalizeSettingService.getOne(null);
-        return Result.ok(setting);
+        return Result.result(setting);
     }
 }

java/storlead-api/src/main/java/com/storlead/system/controller/SystemSettingApiController.java

@@ -4,6 +4,7 @@ import com.storlead.framework.common.result.Result;
 import com.storlead.framework.redis.RedisService;
 import com.storlead.system.constant.ReidsCacheConstant;
 import com.storlead.system.pojo.entity.SystemPersonalizeSettingEntity;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
@@ -17,6 +18,7 @@ import java.util.Objects;
 
 @RestController
 @RequestMapping("/sys/set")
+@Api(tags = "平台中心 - 系统: 系统设置")
 public class SystemSettingApiController {
 
     @Resource
@@ -45,6 +47,6 @@ public class SystemSettingApiController {
         if (Objects.isNull(mode)) {
             mode = 0;
         }
-        return Result.ok(mode);
+        return Result.result(mode);
     }
 }

java/storlead-api/src/main/java/com/storlead/system/controller/SystemWechatConfigApiController.java

@@ -3,6 +3,7 @@ package com.storlead.system.controller;
 import com.storlead.framework.common.result.Result;
 import com.storlead.wecom.pojo.vo.SystemWechatConfigEntity;
 import com.storlead.wecom.service.SystemWechatConfigService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +21,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/sys/wechat/config")
+@Api(tags = "平台中心 - 系统: 企业微信配置")
 public class SystemWechatConfigApiController {
 
     @Resource
@@ -36,6 +38,6 @@ public class SystemWechatConfigApiController {
     @ApiOperation(value = "保存企业微信参数配置")
     public Result<?> getSetting() {
         SystemWechatConfigEntity setting = systemWechatConfigService.getOne(null);
-        return Result.ok(setting);
+        return Result.result(setting);
     }
 }

java/storlead-api/src/main/java/com/storlead/system/controller/UserApiController.java

@@ -128,7 +128,7 @@ public class UserApiController {
                 new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getDeptId,deptId)
                         .ne(UserEntity::getStatus,Integer.valueOf(5))
                         .eq(UserEntity::getIsDelete,0));
-        return Result.ok(list);
+        return Result.result(list);
     }
 
     @ApiOperation("分页查询用户")
@@ -179,7 +179,7 @@ public class UserApiController {
             });
         }
         page.setRecords(us);
-        return Result.ok(page);
+        return Result.result(page);
     }
 
 
@@ -252,7 +252,7 @@ public class UserApiController {
             });
         }
         page.setRecords(us);
-        return Result.ok(page);
+        return Result.result(page);
     }
 
     @ApiOperation("分页查询用户")
@@ -299,7 +299,7 @@ public class UserApiController {
             });
         }
         page.setRecords(us);
-        return Result.ok(page);
+        return Result.result(page);
     }
 
     @ApiOperation("删除人员数据")
@@ -387,7 +387,7 @@ public class UserApiController {
         LambdaUpdateWrapper<UserEntity> query = new LambdaUpdateWrapper();
         query.in(UserEntity::getId,Arrays.asList(ids));
         List<UserEntity> list  =  userService.list(query);
-        return Result.ok(list);
+        return Result.result(list);
     }
 
 
@@ -515,7 +515,7 @@ public class UserApiController {
         if (Objects.nonNull(dept)) {
             detailVo.setDeptJobDes(dept.getDeptJobDes());
         }
-        return Result.ok(detailVo);
+        return Result.result(detailVo);
     }
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
@@ -578,7 +578,7 @@ public class UserApiController {
     public Result<UserEntity> findManager() {
         LoginUser loginUser = LoginUserUtil.getLoginUser();
         UserEntity user = userService.getById(loginUser.getManagerId());
-        return Result.ok(user);
+        return Result.result(user);
     }
 
     public void updateManagerId(UserEntity user,Long oldManagerId){

java/storlead-api/src/main/java/com/storlead/system/controller/UserController.java

@@ -118,7 +118,7 @@ public class UserController {
 	public Result findManager() {
 		LoginUser loginUser = LoginUserUtil.getLoginUser();
 		UserEntity user = sysUserService.getById(loginUser.getManagerId());
-		return Result.ok(user);
+		return Result.result(user);
 	}
 
 }

java/storlead-knowledge/storlead-knowledge-core/src/main/java/com/storlead/knowledge/utils/HttpService.java

@@ -58,7 +58,7 @@ public class HttpService {
 
         if (status >= 200 && status < 300) {
             try {
-                return Result.ok(deserializer.apply(body));
+                return Result.result(deserializer.apply(body));
             } catch (Exception e) {
                 return (Result<T>) Result.error( "json 解析失败："+e.getMessage());
             }
@@ -345,4 +345,4 @@ public class HttpService {
 
         return out.toByteArray();
     }
-}
+}

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/EmailFolderRuleApiController.java

@@ -61,7 +61,7 @@ public class EmailFolderRuleApiController {
             stringMap.put("desc",e.getDesc());
             enumls.add(stringMap);
         }
-        return Result.ok(enumls);
+        return Result.result(enumls);
     }
 
 

java/storlead-message/storlead-message-api/src/main/java/com/storlead/message/controller/MessageApiController.java

@@ -49,7 +49,7 @@ public class MessageApiController {
     })
     public Result<?> getMessage(MessageDTO dto) {
         IPage<MessageDetailVO> pageList =  messageSendLogService.queryListMessageLog(dto);
-        return Result.ok(pageList);
+        return Result.result(pageList);
     }
 
     @PostMapping(value = "/read")
@@ -62,7 +62,7 @@ public class MessageApiController {
         updateWrapper.in(InsideMessageSendLogEntity::getId,messageLogIds);
         updateWrapper.eq(InsideMessageSendLogEntity::getIsDelete,Integer.valueOf(0));
         updateWrapper.set(InsideMessageSendLogEntity::getIsRead,1);
-        return Result.ok(messageSendLogService.update(updateWrapper));
+        return Result.result(messageSendLogService.update(updateWrapper));
     }
 
     @PostMapping(value = "/readAll")
@@ -76,7 +76,7 @@ public class MessageApiController {
             updateWrapper.in(InsideMessageSendLogEntity::getMessageType,messageType);
         }
         updateWrapper.set(InsideMessageSendLogEntity::getIsRead,1);
-        return Result.ok(messageSendLogService.update(updateWrapper));
+        return Result.result(messageSendLogService.update(updateWrapper));
     }
 
     @PostMapping(value = "/cleanAll")
@@ -92,14 +92,14 @@ public class MessageApiController {
         }
         updateWrapper.eq(InsideMessageSendLogEntity::getIsDelete,Integer.valueOf(0));
         updateWrapper.set(InsideMessageSendLogEntity::getIsDelete,1);
-        return Result.ok(messageSendLogService.update(updateWrapper));
+        return Result.result(messageSendLogService.update(updateWrapper));
     }
 
     @PostMapping(value = "/getMessageCount")
     @ApiOperation(value = "获取未读消息数" )
     public Result<?> getMessageCount(MessageDTO dto) {
         MessageNoReadTotalVO countMap = messageSendLogService.countNoReadtotal(buildUnreadQueryWrapper(dto));
-        return Result.ok(countMap);
+        return Result.result(countMap);
     }
 
     @PostMapping(value = "/getNoReadCount")
@@ -121,7 +121,7 @@ public class MessageApiController {
             readState.setStateNumber(statuMap.getOrDefault(readState.getMessageType(), 0));
             readState.setAppId(dto.getAppId());
         }
-        return Result.ok(readStatels);
+        return Result.result(readStatels);
     }
 
     @PostMapping(value = "/getNoReadCountByApp")
@@ -133,7 +133,7 @@ public class MessageApiController {
         QueryWrapper<InsideMessageSendLogEntity> queryWrapper = buildUnreadQueryWrapper(dto);
         queryWrapper.isNotNull("mr.app_id");
         List<MessageAppNoReadVO> list = messageSendLogService.getCountNoReadCountByApp(queryWrapper);
-        return Result.ok(list);
+        return Result.result(list);
     }
 
     /**

java/storlead-message/storlead-message-api/src/main/java/com/storlead/message/controller/MessageTemplateApiController.java

@@ -81,7 +81,7 @@ public class MessageTemplateApiController {
             });
             SysBaseField.dictFileds(pageList.getRecords());
         }
-        return Result.ok(pageList);
+        return Result.result(pageList);
     }
 
     @ApiOperation("保存模板详情")

java/storlead-message/storlead-message-api/src/main/java/com/storlead/message/controller/UserMessageConfigApiController.java

@@ -84,7 +84,7 @@ public class UserMessageConfigApiController {
                 arg.setUserDetails(Objects.isNull(rs) ? Collections.emptyList() : rs);
             });
         }
-        return Result.ok(pageList);
+        return Result.result(pageList);
     }
 
     @ApiOperation("消息开启关闭")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/BulletinController.java

@@ -54,7 +54,7 @@ public class BulletinController {
     public Result<BulletinDetailVO> getById(@RequestParam(name="id",required=false) Long id, Long userId) {
         BulletinDetailVO bulletinDetailVO = bulletinService.getBulletinDetailVOById(id,userId);
         SysBaseField.orgFileds(bulletinDetailVO);
-        return Result.ok(bulletinDetailVO);
+        return Result.result(bulletinDetailVO);
     }
 
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/BusinessController.java

@@ -125,7 +125,7 @@ public class BusinessController {
             return Result.error("参数异常");
         }
         BusinessDetailVO businessDetailVO = businessService.getBusinessVOById(commonSearchDTO.getId());
-        return Result.ok(businessDetailVO);
+        return Result.result(businessDetailVO);
     }
 
 //    @GetMapping(value = "/get-all-by-id")
@@ -136,7 +136,7 @@ public class BusinessController {
             return Result.error("参数异常");
         }
         BusinessAllDetailVO businessAllDetailVO = businessService.getBusinessAllVOById(commonSearchDTO.getId());
-        return Result.ok(businessAllDetailVO);
+        return Result.result(businessAllDetailVO);
     }
 
     @PostMapping(value = "/get-pre-nex-by-id")
@@ -148,7 +148,7 @@ public class BusinessController {
         BusinessAllDetailVO businessAllDetailVO = businessService.getBusinessAllVOById(commonSearchDTO.getId());
         Object ids = redisService.getCacheObject(preNexKey);
         findNeighbors(ids,businessAllDetailVO);
-        return Result.ok(businessAllDetailVO);
+        return Result.result(businessAllDetailVO);
     }
 
     public static void findNeighbors(Object ids, BusinessAllDetailVO businessAllDetailVO) {
@@ -212,7 +212,7 @@ public class BusinessController {
         businessCountVO.setAttachmentCount(resourceService.count(customerWrapper));
         businessCountVO.setOperationCount(operationLogService.count(olWrapper));
 
-        return Result.ok(businessCountVO);
+        return Result.result(businessCountVO);
     }
 
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerController.java

@@ -236,7 +236,7 @@ public class CustomerController {
 //        taskWrapper.eq(TaskEntity::getResourceType, ResourceTypeEnum.CUSTOMER.code);
 //        taskWrapper.eq(TaskEntity::getResourceTypeId, customerCountDTO.getId());
 //        customerCountVO.setTaskCount(taskService.count(taskWrapper));
-        return Result.ok(customerCountVO);
+        return Result.result(customerCountVO);
     }
 
     @PostMapping(value = "/collaborator")
@@ -309,14 +309,14 @@ public class CustomerController {
     @ApiOperation(value = "客户管理查询-通过id查看详情", notes = "客户管理查询-通过id查看详情")
     public Result<CustomerVO> getById(@RequestParam(name="id",required=false) Long id) {
         CustomerVO customerVO = customerService.getCustomerVOById(id);
-        return Result.ok(customerVO);
+        return Result.result(customerVO);
     }
 
     @PostMapping(value = "/get-all-by-id")
     @ApiOperation(value = "客户管理查询-通过id查看客户资料详情", notes = "客户管理查询-通过id查看客户资料详情")
     public Result<CustomerAllVO> getAllById(@RequestBody CustomerSearchDTO customerSearchDTO) {
         CustomerAllVO customerAllVO = customerService.getCustomerAllVOById(customerSearchDTO);
-        return Result.ok(customerAllVO);
+        return Result.result(customerAllVO);
     }
 
     @PostMapping(value = "/get-pre-nex-by-id")
@@ -328,7 +328,7 @@ public class CustomerController {
         CustomerAllVO customerAllVO = customerService.getCustomerAllVOById(customerSearchDTO);
         Object ids = redisService.getCacheObject(preNexKey);
         findNeighbors(ids,customerAllVO);
-        return Result.ok(customerAllVO);
+        return Result.result(customerAllVO);
     }
 
     public static void findNeighbors(Object ids, CustomerAllVO customerAllVO) {

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerFollowUpController.java

@@ -56,7 +56,7 @@ public class CustomerFollowUpController {
     @ApiOperation(value = "客户跟进记录查询-通过id查看详情", notes = "客户跟进记录查询-通过id查看详情")
     public Result<CustomerFollowUpDetailVO> getById(@RequestParam(name="id",required=false) Long id) {
         CustomerFollowUpDetailVO customerFollowUpDetailVO = customerFollowUpService.getVOById(id);
-        return Result.ok(customerFollowUpDetailVO);
+        return Result.result(customerFollowUpDetailVO);
     }
 
     @ApiOperation(value = "客户跟进记录管理-删除客户跟进记录", notes = "客户跟进记录管理-删除客户跟进记录")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerFollowUpEmailsController.java

@@ -60,7 +60,7 @@ public class CustomerFollowUpEmailsController {
     @ApiOperation(value = "跟进邮件联查-列表111", notes = "跟进邮件联查-列表111")
     public Result list() {
        Long a = 0L;
-        return Result.ok(a);
+        return Result.result(a);
     }
 
     @PostMapping(value = "/edit-follow-status")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/LiaisonController.java

@@ -124,7 +124,7 @@ public class LiaisonController {
             return Result.error("参数异常");
         }
         LiaisonListVO liaisonListVO = liaisonService.getLiaisonById(commonSearchDTO.getId());
-        return Result.ok(liaisonListVO);
+        return Result.result(liaisonListVO);
     }
 
     @PostMapping(value = "/data-count")
@@ -160,7 +160,7 @@ public class LiaisonController {
         liaisonCountVO.setLiaisonCount(liaisonService.count(liaisonwrapper));
         liaisonCountVO.setEmailCount(customerMailBingMarkService.count(emailwrapper));
         liaisonCountVO.setOperationCount(operationLogService.count(olWrapper));
-        return Result.ok(liaisonCountVO);
+        return Result.result(liaisonCountVO);
     }
 
     @ApiOperation(value = "客户联系人管理-删除", notes = "客户联系人管理-删除")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/OrderFormController.java

@@ -109,7 +109,7 @@ public class OrderFormController {
             return Result.error("参数异常");
         }
         OrderFormDetailVO orderFormDetailVO = orderFormService.getOrderFormVOById(commonSearchDTO.getId());
-        return Result.ok(orderFormDetailVO);
+        return Result.result(orderFormDetailVO);
     }
 
     @PostMapping(value = "/data-count")
@@ -143,7 +143,7 @@ public class OrderFormController {
         orderCountVO.setQuotationCount(totalOrderAmt);
         orderCountVO.setAttachmentCount(resourceService.count(customerwrapper));
         orderCountVO.setOperationCount(operationLogService.count(olWrapper));
-        return Result.ok(orderCountVO);
+        return Result.result(orderCountVO);
     }
 
     @PostMapping(value = "/get-pre-nex-by-id")
@@ -155,7 +155,7 @@ public class OrderFormController {
         OrderFormDetailVO orderFormDetailVO = orderFormService.getOrderFormVOById(commonSearchDTO.getId());
         Object ids = redisService.getCacheObject(preNexKey);
         findNeighbors(ids,orderFormDetailVO);
-        return Result.ok(orderFormDetailVO);
+        return Result.result(orderFormDetailVO);
     }
 
     public static void findNeighbors(Object ids, OrderFormDetailVO orderFormDetailVO) {

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/RecordCommentController.java

@@ -97,7 +97,7 @@ public class RecordCommentController {
 //                assembleService.sendOrderEventMessages(customerTransferDTO.getIdList().get(0),"TRANSFER_ORDER");
 //            }
 
-            return Result.ok("评论成功！");
+            return Result.result("评论成功！");
         }else {
             return Result.error("评论失败！");
         }
@@ -124,6 +124,6 @@ public class RecordCommentController {
         }
         //递归删除所有子评论
         recordCommentService.removeByParentid(commentId);
-        return Result.ok("删除成功!");
+        return Result.result("删除成功!");
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/SendRecordController.java

@@ -65,7 +65,7 @@ public class SendRecordController {
         }
 
         if (isOk){
-            return Result.ok("操作成功");
+            return Result.result("操作成功");
         }
         return Result.error("处理失败!");
     }
@@ -86,7 +86,7 @@ public class SendRecordController {
     public Result<SendRecordDetailVO> getById(@RequestParam(name="id",required=false) Long id) {
 
         SendRecordDetailVO  sendRecordDetailVO = sendRecordService.getSendRecordVOById(id);
-        return Result.ok(sendRecordDetailVO);
+        return Result.result(sendRecordDetailVO);
     }
 
     @ApiOperation(value = "客户寄样记录管理-删除", notes = "客户寄样记录管理-删除")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/SummaryController.java

@@ -148,11 +148,11 @@ public class SummaryController {
             if (!CollectionUtils.isEmpty(dto.getDeptIds())) {
                 Set<Long> userIds = userService.getUserIdsByDeptIds(dto.getDeptIds());
                 if (CollectionUtils.isEmpty(userIds)) {
-                    return Result.ok(new SalesDataAddTotalVO());
+                    return Result.result(new SalesDataAddTotalVO());
                 }
                 dto.setOwnerByIds(List.copyOf(userIds));
             } else {
-                return Result.ok(new SalesDataAddTotalVO());
+                return Result.result(new SalesDataAddTotalVO());
             }
         } else {
             if (!CollectionUtils.isEmpty(dto.getDeptIds()) && CollectionUtils.isEmpty(dto.getOwnerByIds()) ) {
@@ -196,11 +196,11 @@ public class SummaryController {
             if (!CollectionUtils.isEmpty(dto.getDeptIds())) {
                 Set<Long> userIds = userService.getUserIdsByDeptIds(dto.getDeptIds());
                 if (CollectionUtils.isEmpty(userIds)) {
-                    return Result.ok(new SalesDataAddTotalVO());
+                    return Result.result(new SalesDataAddTotalVO());
                 }
                 dto.setOwnerByIds(List.copyOf(userIds));
             } else {
-                return Result.ok(new SalesDataAddTotalVO());
+                return Result.result(new SalesDataAddTotalVO());
             }
         } else {
             Set dataScope = userRoleService.dataSelete(OrganizationalTypeEnum.USER_GROUP);
@@ -236,11 +236,11 @@ public class SummaryController {
             if (!CollectionUtils.isEmpty(dto.getDeptIds())) {
                 Set<Long> userIds = userService.getUserIdsByDeptIds(dto.getDeptIds());
                 if (CollectionUtils.isEmpty(userIds)) {
-                    return Result.ok(new SalesDataAddTotalVO());
+                    return Result.result(new SalesDataAddTotalVO());
                 }
                 dto.setOwnerByIds(List.copyOf(userIds));
             } else {
-                return Result.ok(new SalesDataAddTotalVO());
+                return Result.result(new SalesDataAddTotalVO());
             }
         } else {
             Set dataScope = userRoleService.dataSelete(OrganizationalTypeEnum.USER_GROUP);
@@ -276,11 +276,11 @@ public class SummaryController {
             if (!CollectionUtils.isEmpty(dto.getDeptIds())) {
                 Set<Long> userIds = userService.getUserIdsByDeptIds(dto.getDeptIds());
                 if (CollectionUtils.isEmpty(userIds)) {
-                    return Result.ok(new SalesDataAddTotalVO());
+                    return Result.result(new SalesDataAddTotalVO());
                 }
                 dto.setOwnerByIds(List.copyOf(userIds));
             } else {
-                return Result.ok(new SalesDataAddTotalVO());
+                return Result.result(new SalesDataAddTotalVO());
             }
         } else {
             Set dataScope = userRoleService.dataSelete(OrganizationalTypeEnum.USER_GROUP);

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/SysResourceController.java

@@ -53,7 +53,7 @@ public class SysResourceController {
     })
     public Result<?> searchDeptStaffList(SysResourceEntity sysResource) {
         List<SysResourceEntity> reuslt = sysResourceService.list(buildQueryWrapper(sysResource));
-        return Result.ok(reuslt);
+        return Result.result(reuslt);
     }
 
     @GetMapping(value = "/list")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/WorkOrderController.java

@@ -81,7 +81,7 @@ public class WorkOrderController {
     public Result<WorkOrderDetailVO> getById(@RequestParam(name="id",required=false) Long id) {
 
         WorkOrderDetailVO workOrderDetailVO = workOrderService.getWorkOrderVOById(id);
-        return Result.ok(workOrderDetailVO);
+        return Result.result(workOrderDetailVO);
     }
 
     @ApiOperation(value = "工单管理-删除商机", notes = "工单管理-删除商机")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/mail/MailApiController.java

@@ -729,7 +729,7 @@ public class MailApiController {
             } else if (stringCustomerIds.size() > 1) {
                 mail.setFollowUpId(null);
             }
-            return Result.ok(mail);
+            return Result.result(mail);
         } catch (Exception e) {
             return Result.error("获取邮件失败，请确认邮箱邮件是否已删除");
         }
@@ -1705,7 +1705,7 @@ public class MailApiController {
 //                emailsService.bindLiaisonMailCustomerIdByMailIdAndUserId(entity.getId(), recipient, entity.getOwnerBy(), 2);
 //            }
 //        }
-//        return Result.ok("操作完成");
+//        return Result.result("操作完成");
 //    }
 
 //    @PostMapping(value = "/bind_mail_customer_all")
@@ -1753,7 +1753,7 @@ public class MailApiController {
 //                }
 //            }
 //        }
-//        return Result.ok("操作完成");
+//        return Result.result("操作完成");
 //    }
 
     @PostMapping(value = "/email_list")
@@ -1787,7 +1787,7 @@ public class MailApiController {
             }
         }
 
-        return Result.ok(emailPage);
+        return Result.result(emailPage);
     }
 
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/mail/UserClickRecordController.java

@@ -58,7 +58,7 @@ public class UserClickRecordController {
             data = customerFollowUpService.selectUserClickTitle(currentUserId,dto.getTitle());
         }
 
-        return Result.ok(data);
+        return Result.result(data);
     }
 
     @PostMapping(value = "/click_record")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/material/MaterialEntryRecordApiController.java

@@ -120,7 +120,7 @@ public class MaterialEntryRecordApiController {
         pageVO.setPages(page.getPages());
         pageVO.setRecords(vos);
         pageVO.setCurrent(page.getCurrent());
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @ApiOperation("按照日期查询")
@@ -177,7 +177,7 @@ public class MaterialEntryRecordApiController {
                         )
                 ));
 
-        return Result.ok(groupedByDate);
+        return Result.result(groupedByDate);
     }
 
     @GetMapping(value = "/get-by-id")
@@ -186,7 +186,7 @@ public class MaterialEntryRecordApiController {
 
         MaterialEntryVO entryVO = materialEntryRecordService.getVOById(id);
         entryVO.setIsEdit(isCreatedBefore72Hours(entryVO.getCreateTime()));
-        return Result.ok(entryVO);
+        return Result.result(entryVO);
     }
 
 //    @ApiOperation("查询")
@@ -387,7 +387,7 @@ public class MaterialEntryRecordApiController {
         response.put("dir", upload_dir);
         response.put("host", host);
         // 返回带有状态码 200 (OK) 的 ResponseEntity，返回给Web端，进行PostObject操作
-        return Result.ok(response);
+        return Result.result(response);
     }
 
     public static byte[] hmacsha256(byte[] key, String data) {

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/material/WebOssController.java

@@ -213,7 +213,7 @@ public class WebOssController {
         response.put("dir", upload_dir);
         response.put("host", host);
         // 返回带有状态码 200 (OK) 的 ResponseEntity，返回给Web端，进行PostObject操作
-        return Result.ok(response);
+        return Result.result(response);
     }
     public static byte[] hmacsha256(byte[] key, String data) {
         try {

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/message/MessageApiController.java

@@ -85,7 +85,7 @@ public class MessageApiController {
         queryWrapper.orderByAsc("mlog.is_read");
         queryWrapper.orderByDesc("mlog.id");
         IPage<MessageDetailVO> pageList =  messageSendLogService.queryListMessageLog(page,queryWrapper);
-        return Result.ok(pageList);
+        return Result.result(pageList);
     }
 
     @PostMapping(value = "/read")
@@ -98,7 +98,7 @@ public class MessageApiController {
         updateWrapper.in(InsideMessageSendLogEntity::getId,messageLogIds);
         updateWrapper.eq(InsideMessageSendLogEntity::getIsDelete,Integer.valueOf(0));
         updateWrapper.set(InsideMessageSendLogEntity::getIsRead,1);
-        return Result.ok(messageSendLogService.update(updateWrapper));
+        return Result.result(messageSendLogService.update(updateWrapper));
     }
 
     @PostMapping(value = "/readAll")
@@ -112,7 +112,7 @@ public class MessageApiController {
             updateWrapper.in(InsideMessageSendLogEntity::getMessageType,messageType);
         }
         updateWrapper.set(InsideMessageSendLogEntity::getIsRead,1);
-        return Result.ok(messageSendLogService.update(updateWrapper));
+        return Result.result(messageSendLogService.update(updateWrapper));
     }
 
     @PostMapping(value = "/cleanAll")
@@ -128,7 +128,7 @@ public class MessageApiController {
         }
         updateWrapper.eq(InsideMessageSendLogEntity::getIsDelete,Integer.valueOf(0));
         updateWrapper.set(InsideMessageSendLogEntity::getIsDelete,1);
-        return Result.ok(messageSendLogService.update(updateWrapper));
+        return Result.result(messageSendLogService.update(updateWrapper));
     }
 
     @PostMapping(value = "/getMessageCount")
@@ -142,7 +142,7 @@ public class MessageApiController {
         }
         queryWrapper.eq("mlog.is_delete",Integer.valueOf(0));
         MessageNoReadTotalVO countMap = messageSendLogService.countNoReadtotal(queryWrapper);
-        return Result.ok(countMap);
+        return Result.result(countMap);
     }
 
     @PostMapping(value = "/getNoReadCount")
@@ -165,6 +165,6 @@ public class MessageApiController {
         for (MessageTypeReadStateVO readState : readStatels) {
             readState.setStateNumber(statuMap.getOrDefault(readState.getMessageType(),0));
         }
-        return Result.ok(readStatels);
+        return Result.result(readStatels);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/message/MessageTemplateApiController.java

@@ -85,7 +85,7 @@ public class MessageTemplateApiController {
             });
             SysBaseField.dictFileds(pageList.getRecords());
         }
-        return Result.ok(pageList);
+        return Result.result(pageList);
     }
 
     @ApiOperation("保存模板详情")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/message/UserMessageConfigApiController.java

@@ -84,7 +84,7 @@ public class UserMessageConfigApiController {
                 arg.setUserDetails(Objects.isNull(rs) ? Collections.emptyList() : rs);
             });
         }
-        return Result.ok(pageList);
+        return Result.result(pageList);
     }
 
     @ApiOperation("消息开启关闭")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/CustomerAttributeAnalysisApiController.java

@@ -132,7 +132,7 @@ public class CustomerAttributeAnalysisApiController {
             }
             List<UserEntity> userList = userService.list(userWrapper);
             if (ObjectUtils.isEmpty(userList)){
-                return Result.ok(new DataSummaryTotalVO());
+                return Result.result(new DataSummaryTotalVO());
             }
             userIdList = userList.stream().map(UserEntity::getId).collect(Collectors.toList());
         }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/SalesProcessAnalysisApiController.java

@@ -173,11 +173,11 @@ public class SalesProcessAnalysisApiController {
             if (!CollectionUtils.isEmpty(dto.getDeptIds())) {
                 Set<Long> userIds = userService.getUserIdsByDeptIds(dto.getDeptIds());
                 if (CollectionUtils.isEmpty(userIds)) {
-                    return Result.ok(new SalesDataAddTotalVO());
+                    return Result.result(new SalesDataAddTotalVO());
                 }
                 dto.setOwnerByIds(List.copyOf(userIds));
             } else {
-                return Result.ok(new SalesDataAddTotalVO());
+                return Result.result(new SalesDataAddTotalVO());
             }
         } else {
             Set dataScope = userRoleService.dataSelete(OrganizationalTypeEnum.USER_GROUP);

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/sku/QuotationController.java

@@ -58,7 +58,7 @@ public class QuotationController {
     public Result<QuotationDetailVO> getById(@RequestParam(name="id",required=false) Long id) {
 
         QuotationDetailVO quotationDetailVO = quotationService.getQuotationDetailVOById(id);
-        return Result.ok(quotationDetailVO);
+        return Result.result(quotationDetailVO);
     }
 
     @GetMapping(value = "/get-amt")
@@ -73,7 +73,7 @@ public class QuotationController {
         QuotationEntity quotation = quotationService.getOne(wrapper);
         QuotationAmtVO quotationDetailVO = new QuotationAmtVO();
         BeanUtils.copyProperties(quotation,quotationDetailVO);
-        return Result.ok(quotationDetailVO);
+        return Result.result(quotationDetailVO);
     }
 
     @GetMapping(value = "/get-detail")
@@ -81,7 +81,7 @@ public class QuotationController {
     public Result<QuotationDetailVO> geDetail(QuotationSearchDTO quotationSearchDTO) {
 
         QuotationDetailVO quotationDetailVO = quotationService.getQuotationDetailVO(quotationSearchDTO);
-        return Result.ok(quotationDetailVO);
+        return Result.result(quotationDetailVO);
     }
 
     @GetMapping(value = "/list")
@@ -579,6 +579,6 @@ public class QuotationController {
         }
         quotationEntity.setIsDelete(CommonConstant.DEL_FLAG_1);
         boolean result = quotationService.updateById(quotationEntity);
-        return result ? Result.ok("删除成功") : Result.error("删除失败");
+        return result ? Result.result("删除成功") : Result.error("删除失败");
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/sku/SsdskuController.java

@@ -113,7 +113,7 @@ public class SsdskuController {
     @ApiOperation(value = "产品管理-汇率查询", notes = "产品管理-汇率查询")
     public Result getRate(){
         BigDecimal uSDToCNYRate = ssdSkuService.getRate();
-        return Result.ok(uSDToCNYRate);
+        return Result.result(uSDToCNYRate);
     }
 
     /**
@@ -155,7 +155,7 @@ public class SsdskuController {
             }
             objList.add(result.getResult());
         }
-        return Result.ok(objList);
+        return Result.result(objList);
     }
 
     @GetMapping("ssd_config")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/ApproveLogController.java

@@ -36,6 +36,6 @@ public class ApproveLogController {
         wrapper.eq(ApproveLogEntity::getApproveId,approveId);
         wrapper.orderByAsc(ApproveLogEntity::getId);
         List<ApproveLogEntity> list = approveLogService.list(wrapper);
-        return Result.ok(list);
+        return Result.result(list);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/ApproveNodeController.java

@@ -57,7 +57,7 @@ public class ApproveNodeController {
             approveTypeVO.setTypeName(approveType.desc);
             approveTypeList.add(approveTypeVO);
         }
-        return Result.ok(approveTypeList);
+        return Result.result(approveTypeList);
     }
 
     /***
@@ -77,7 +77,7 @@ public class ApproveNodeController {
         wrapper.eq(ApproveNodeEntity::getApproveType,type);
         wrapper.orderByAsc(ApproveNodeEntity::getSubCompanyId,ApproveNodeEntity::getNodeSort);
         List<ApproveNodeEntity> approveNodeList = approveNodeService.list(wrapper);
-        return Result.ok(approveNodeList);
+        return Result.result(approveNodeList);
     }
 
     @ApiOperation("添加/修改审批节点")
@@ -131,7 +131,7 @@ public class ApproveNodeController {
         if (!isOk){
             return Result.error("操作失败！");
         }
-        return Result.ok("操作成功");
+        return Result.result("操作成功");
     }
     @ApiOperation("删除/批量删除审批节点")
     @DeleteMapping("/delete-by-ids")
@@ -141,6 +141,6 @@ public class ApproveNodeController {
         if (!isOk){
             return Result.error("删除失败！");
         }
-        return Result.ok("删除成功");
+        return Result.result("删除成功");
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/CurrencySettingsController.java

@@ -73,7 +73,7 @@ public class CurrencySettingsController {
         pageVO.setPages(pageList.getPages());
         pageVO.setCurrent(pageList.getCurrent());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
 
     }
 
@@ -92,7 +92,7 @@ public class CurrencySettingsController {
         }
         boolean isOk = currencySettingsService.saveOrUpdate(currencySettingsEntity);
        if (isOk){
-           return Result.ok("操作成功！");
+           return Result.result("操作成功！");
        }
        return Result.error("操作失败!");
     }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/SystemRuleConfigController.java

@@ -30,7 +30,7 @@ public class SystemRuleConfigController {
 //    })
 //    public Result<?> list(@ApiParam("规则配置请求参数类") SystemRuleConfigDTO systemRuleConfigDTO) {
 //        List<SystemRuleConfigVO> list = systemRuleConfigService.listByKeywords(systemRuleConfigDTO);
-//        return Result.ok(list);
+//        return Result.result(list);
 //    }
 
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/SystemRuleModuleConfigController.java

@@ -51,7 +51,7 @@ public class SystemRuleModuleConfigController {
     })
     public Result<?> list(@ApiParam("规则配置请求参数类") SystemRuleModuleConfigDTO systemRuleModuleConfigDTO) {
         IPage<SystemRuleModuleConfigVO> pageList = systemRuleModuleConfigService.listByKeywords(systemRuleModuleConfigDTO);
-        return Result.ok(pageList);
+        return Result.result(pageList);
     }
 
     @PostMapping(value = "/get-by-id")
@@ -80,7 +80,7 @@ public class SystemRuleModuleConfigController {
         BeanUtils.copyProperties(configDTO, configEntity);
         configEntity.setCustomerTypeRules(JSON.toJSONString(customerTypeRules));
         systemRuleModuleConfigService.saveOrUpdate(configEntity);
-        return Result.ok("修改成功");
+        return Result.result("修改成功");
     }
 
     @PostMapping(value = "/edit")
@@ -90,7 +90,7 @@ public class SystemRuleModuleConfigController {
         SystemRuleModuleConfigEntity sysRuleModuleConfigEntity = new SystemRuleModuleConfigEntity();
         BeanUtils.copyProperties(systemRuleModuleConfigDTO, sysRuleModuleConfigEntity);
         systemRuleModuleConfigService.saveOrUpdate(sysRuleModuleConfigEntity);
-        return Result.ok("修改成功");
+        return Result.result("修改成功");
     }
 
     @ApiOperation(value = "规则配置相关接口-删除", notes = "规则配置相关接口-删除")
@@ -114,6 +114,6 @@ public class SystemRuleModuleConfigController {
         wrapper.eq(SystemRuleFieldConfigEntity::getResourceType,resourceType);
         wrapper.eq(SystemRuleFieldConfigEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
         List<SystemRuleFieldConfigEntity> ls = fieldConfigService.list(wrapper);
-        return Result.ok(ls);
+        return Result.result(ls);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/target/TargetPlanController.java

@@ -132,7 +132,7 @@ public class TargetPlanController {
             assembleService.sendTargetPlanEventMessages(businessDeleteDTO.getId(), "CONFIG_DELETE" ,userIds,null);
 
         }
-        return Result.ok("删除成功");
+        return Result.result("删除成功");
     }
 
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/task/TaskApiController.java

@@ -103,7 +103,7 @@ public class TaskApiController {
 //        queryWrapper.like(TaskEntity::getIsDelete, Integer.valueOf(0));
 //        List<TaskVO> vos = taskService.list(queryWrapper);
 //        page.setRecords(vos);
-//        return Result.ok(ss);
+//        return Result.result(ss);
 //    }
 
     @ApiOperation("保存任务")
@@ -152,7 +152,7 @@ public class TaskApiController {
             task.setCustomerId(getCustomerId(dto,dto.getResourceTypeId()));
             taskService.saveOrUpdate(task);
             assembleService.sendCustomerEventMessages(task.getCustomerId(), "NEW_TASK");
-            return Result.ok(task.getId());
+            return Result.result(task.getId());
         }
     }
 
@@ -339,7 +339,7 @@ public class TaskApiController {
                 }
             }
         }
-        return Result.ok(vos);
+        return Result.result(vos);
     }
 
 
@@ -422,7 +422,7 @@ public class TaskApiController {
                 }
             }
         }
-        return Result.ok(vos);
+        return Result.result(vos);
     }
 
 
@@ -442,7 +442,7 @@ public class TaskApiController {
 
         Map<String,Integer> map = new TreeMap<>();
         map.put("taskCount",taskCount);
-        return Result.ok(map);
+        return Result.result(map);
 
     }
 
@@ -655,7 +655,7 @@ public class TaskApiController {
         //IPage<TaskEntity> pageList = taskService.pageWithScope(page, queryWrapper,param,mergeSql.toString());
 
         if (CollectionUtils.isEmpty(pageList)) {
-            return Result.ok(Collections.EMPTY_MAP);
+            return Result.result(Collections.EMPTY_MAP);
         }
         List<TaskVO> vos = SysBaseField.list(pageList, TaskVO.class);
 
@@ -707,7 +707,7 @@ public class TaskApiController {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         Map<String, List<TaskVO>> groupedByDate = vos.stream()
                 .collect(Collectors.groupingBy(task -> task.getTaskBeginTime().format(formatter)));
-        return Result.ok(groupedByDate);
+        return Result.result(groupedByDate);
     }
 
 
@@ -788,7 +788,7 @@ public class TaskApiController {
         List<TaskEntity> pageList = taskService.list(queryWrapper);
 
         if (CollectionUtils.isEmpty(pageList)) {
-            return Result.ok(Collections.EMPTY_MAP);
+            return Result.result(Collections.EMPTY_MAP);
         }
         List<TaskVO> vos = SysBaseField.list(pageList, TaskVO.class);
 
@@ -840,7 +840,7 @@ public class TaskApiController {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         Map<String, List<TaskVO>> groupedByDate = vos.stream()
                 .collect(Collectors.groupingBy(task -> task.getTaskBeginTime().format(formatter)));
-        return Result.ok(groupedByDate);
+        return Result.result(groupedByDate);
     }
 
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/BroadcastDataServiceImpl.java

@@ -145,7 +145,7 @@ public class BroadcastDataServiceImpl implements BroadcastDataService {
             log.error("保存dashboard数据失败", e);
         }
 
-        return Result.ok(companyVO);
+        return Result.result(companyVO);
     }
 
     @Override
@@ -157,7 +157,7 @@ public class BroadcastDataServiceImpl implements BroadcastDataService {
 
         List<SubCompanyEntity> subCompanies = broadcastDataMapper.subCompanyList();
         if (subCompanies == null || subCompanies.isEmpty()) {
-            return Result.ok(true);
+            return Result.result(true);
         }
 
         List<BroadcastCompanyVO> resultList = new ArrayList<>();
@@ -227,7 +227,7 @@ public class BroadcastDataServiceImpl implements BroadcastDataService {
             }
         }
 
-        return Result.ok(resultList);
+        return Result.result(resultList);
     }
 
     @Override
@@ -240,7 +240,7 @@ public class BroadcastDataServiceImpl implements BroadcastDataService {
         // 获取周期内有任何新增数据的用户集合
         Set<Long> activeUserIds = fetchPersonUserIds(range);
         if (activeUserIds.isEmpty()) {
-            return Result.ok(createEmptyPersonVO(range));
+            return Result.result(createEmptyPersonVO(range));
         }
 
         // 按照用户的实际部门ID对有数据的用户进行分组
@@ -258,7 +258,7 @@ public class BroadcastDataServiceImpl implements BroadcastDataService {
         }
 
         if (deptActiveUserMap.isEmpty()) {
-            return Result.ok(createEmptyPersonVO(range));
+            return Result.result(createEmptyPersonVO(range));
         }
 
         // 准备分公司名称映射
@@ -355,7 +355,7 @@ public class BroadcastDataServiceImpl implements BroadcastDataService {
             }
         }
 
-        return Result.ok(true);
+        return Result.result(true);
     }
 
     @Override
@@ -369,7 +369,7 @@ public class BroadcastDataServiceImpl implements BroadcastDataService {
         Set<Long> userIds = fetchPersonUserIds(range);
 
         if (userIds.isEmpty()) {
-            return Result.ok(true);
+            return Result.result(true);
         }
 
         for (Long userId : userIds) {
@@ -421,7 +421,7 @@ public class BroadcastDataServiceImpl implements BroadcastDataService {
             }
         }
 
-        return Result.ok(true);
+        return Result.result(true);
     }
 
     private BroadcastPersonVO createEmptyPersonVO(DateRange range) {

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/CustomerAttributeAnalysisServiceImpl.java

@@ -687,7 +687,7 @@ public class CustomerAttributeAnalysisServiceImpl implements CustomerAttributeAn
             dataSummaryTotalVO.setTransactionsAmount(totalAmount);
         }
 
-        return Result.ok(dataSummaryTotalVO);
+        return Result.result(dataSummaryTotalVO);
     }
 
     @Override
@@ -785,6 +785,6 @@ public class CustomerAttributeAnalysisServiceImpl implements CustomerAttributeAn
         resultMap.put("followUpGrowthRate", followUpGrowthRate);
         resultMap.put("followUpCount", followUpCount);
 
-        return Result.ok(resultMap);
+        return Result.result(resultMap);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/SysTaskServiceImpl.java

@@ -77,7 +77,7 @@ public class SysTaskServiceImpl implements SysTaskService {
             resultMap.put("current", pageIndex);
             resultMap.put("pages", pageSize % pageIndex == 0 ? pageSize / pageIndex : pageSize / pageIndex + 1);
 //            result.setData(resultMap);
-            return Result.ok(resultMap);
+            return Result.result(resultMap);
         } catch (SchedulerException e) {
             log.error("分页查询定时任务失败，pageIndex={},pageSize={},e={}", pageIndex, pageSize, e);
             return Result.error("分页查询定时任务失败 " + e.getMessage());

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/BulletinServiceImpl.java

@@ -126,7 +126,7 @@ public class BulletinServiceImpl extends MyBaseServiceImpl<BulletinMapper, Bulle
                 assembleService.sendBulletinMessages(bulletinEntity.getId(),"ADD_BULLETIN",toUserIds,remindMode);
             }
 
-            return Result.ok("公告发布成功");
+            return Result.result("公告发布成功");
         }else {
             return Result.error("公告发布失败");
         }
@@ -322,7 +322,7 @@ public class BulletinServiceImpl extends MyBaseServiceImpl<BulletinMapper, Bulle
                 Set<Long> toUserIds = new HashSet<>(bulletinDTO.getNoticeUserIdList());
                 assembleService.sendBulletinMessages(bulletinEntity.getId(),"ADD_BULLETIN",toUserIds,remindMode);
             }
-            return Result.ok("公告修改成功");
+            return Result.result("公告修改成功");
         }else {
             return Result.error("公告修改失败");
         }
@@ -367,7 +367,7 @@ public class BulletinServiceImpl extends MyBaseServiceImpl<BulletinMapper, Bulle
         if(isOk) {
             //删除read 记录
             bulletinReadService.delete(bulletinId);
-            return Result.ok("删除成功！");
+            return Result.result("删除成功！");
         }
         return Result.error("删除失败!");
     }
@@ -442,7 +442,7 @@ public class BulletinServiceImpl extends MyBaseServiceImpl<BulletinMapper, Bulle
                 bulletin.setCommentls(vs);
             }
         }
-        return Result.ok(page);
+        return Result.result(page);
     }
 
     /**
@@ -480,7 +480,7 @@ public class BulletinServiceImpl extends MyBaseServiceImpl<BulletinMapper, Bulle
         int count = bulletinReadService.count(wrapper);
         HashMap<String, Object> resultAttributes = new HashMap<>();
         resultAttributes.put("count",count);
-        return Result.ok(resultAttributes);
+        return Result.result(resultAttributes);
     }
 
     /**

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/BusinessServiceImpl.java

@@ -189,7 +189,7 @@ public class BusinessServiceImpl extends MyBaseServiceImpl<BusinessMapper, Busin
 
             }
 
-            return Result.ok(businessEntity.getId());
+            return Result.result(businessEntity.getId());
         }
         return Result.error("操作失败！");
     }
@@ -221,14 +221,14 @@ public class BusinessServiceImpl extends MyBaseServiceImpl<BusinessMapper, Busin
             }else {
                 wrapper.and(w ->w.like(BusinessEntity::getTitle, businessSearchDTO.getCustomerName()).or().like(BusinessEntity::getDataCode, businessSearchDTO.getCustomerName()));
 
-//                return Result.ok(pageVO);
+//                return Result.result(pageVO);
             }
         }
         if (!CollectionUtils.isEmpty(businessSearchDTO.getDeptIds())){
             //查询部门的全部用户
             Set<Long> userIdSet = userService.getUserIdsByDeptIds(businessSearchDTO.getDeptIds());
             if (CollectionUtils.isEmpty(userIdSet)){
-                return Result.ok(pageVO);
+                return Result.result(pageVO);
             }
             wrapper.in(BusinessEntity::getOwnerBy,userIdSet);
         }
@@ -335,7 +335,7 @@ public class BusinessServiceImpl extends MyBaseServiceImpl<BusinessMapper, Busin
             }
 
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
 //        List<CustomerListVO> customerListVO = new ArrayList<>();
         //复制list给VO类
@@ -366,7 +366,7 @@ public class BusinessServiceImpl extends MyBaseServiceImpl<BusinessMapper, Busin
 
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/CustomerFollowUpEmailsServiceImpl.java

@@ -92,7 +92,7 @@ public class CustomerFollowUpEmailsServiceImpl extends MyBaseServiceImpl<Custome
 //        page = pageWithScope(page, wrapper,customerFollowUpEmailsSearchDTO,"");
         page = page(page, wrapper);
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(page);
+            return Result.result(page);
         }
         DefaultMapperFactory mapperFactory = new DefaultMapperFactory.Builder().build();
         List<CustomerFollowUpEmailsListVO> customerFollowUpEmailsListVO = mapperFactory.getMapperFacade().mapAsList(page.getRecords(),CustomerFollowUpEmailsListVO.class);
@@ -256,7 +256,7 @@ public class CustomerFollowUpEmailsServiceImpl extends MyBaseServiceImpl<Custome
         pageVO.setCurrent(page.getCurrent());
         SysBaseField.orgFileds(pageVO.getRecords());
         SysBaseField.dictFileds(pageVO.getRecords());
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
 //        return null;
     }
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/CustomerFollowUpServiceImpl.java

@@ -242,7 +242,7 @@ public class CustomerFollowUpServiceImpl extends MyBaseServiceImpl<CustomerFollo
                 assembleService.sendFollowEventMessages(customerFollowUp.getId(),"FOLLOW_UP_REMINDER",new HashSet<>(customerFollowUpAddDTO.getRemindUserIdsTemp()));
             }
 
-            return Result.ok("操作成功");
+            return Result.result("操作成功");
         }
         return Result.error("处理失败!");
     }
@@ -419,7 +419,7 @@ public class CustomerFollowUpServiceImpl extends MyBaseServiceImpl<CustomerFollo
 
         page = pageWithScope(page, wrapper,customerFollowUpSearchDTO,mergeSql.toString());
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(page);
+            return Result.result(page);
         }
         DefaultMapperFactory mapperFactory = new DefaultMapperFactory.Builder().build();
         List<CustomerFollowUpListVO> customerFollowUpListVOList = mapperFactory.getMapperFacade().mapAsList(page.getRecords(),CustomerFollowUpListVO.class);
@@ -481,7 +481,7 @@ public class CustomerFollowUpServiceImpl extends MyBaseServiceImpl<CustomerFollo
         pageVO.setCurrent(page.getCurrent());
         SysBaseField.orgFileds(pageVO.getRecords());
         SysBaseField.dictFileds(pageVO.getRecords());
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/CustomerOwnerRecordServiceImpl.java

@@ -57,7 +57,7 @@ public class CustomerOwnerRecordServiceImpl extends MyBaseServiceImpl<CustomerOw
 //        page = pageWithScope(page, wrapper,customerOwnerRecordSearchDTO,"");
         page = page(page, wrapper);
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
         DefaultMapperFactory mapperFactory = new DefaultMapperFactory.Builder().build();
         List<CustomerOwnerRecordListVO> customerOwnerRecordListVO = mapperFactory.getMapperFacade().mapAsList(page.getRecords(),CustomerOwnerRecordListVO.class);
@@ -85,7 +85,7 @@ public class CustomerOwnerRecordServiceImpl extends MyBaseServiceImpl<CustomerOw
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
 
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/CustomerSearchServiceImpl.java

@@ -205,6 +205,6 @@ public class CustomerSearchServiceImpl extends MyBaseServiceImpl<CustomerSearchM
         }
 //        SysBaseField.dictFileds(customerSearchListVOList);
 //        SysBaseField.orgFileds(pageVO.getRecords());
-        return Result.ok(objectPage);
+        return Result.result(objectPage);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/CustomerServiceImpl.java

@@ -237,7 +237,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                 liaisonEntityLambdaUpdateWrapper.set(LiaisonEntity::getOwnerBy, null);
                 liaisonService.update(liaisonEntityLambdaUpdateWrapper);
             }
-            return Result.ok(customerEntity.getId());
+            return Result.result(customerEntity.getId());
         }
         return Result.error("添加失败！");
     }
@@ -540,7 +540,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                     customerMailBingMarkService.updateCustomerMailBingMark(customerId,cmails,liasionId,lmails);
                 }
             }
-            return Result.ok(customerEntity.getId());
+            return Result.result(customerEntity.getId());
         }
 
 
@@ -783,7 +783,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                             errorVO.setResourceType(customer.getCustomerForm().toString());
                         }
                     }
-                    return Result.ok(errorCanSaveVOList);
+                    return Result.result(errorCanSaveVOList);
                 }
 
 
@@ -884,7 +884,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                             errorVO.setResourceType(customer.getCustomerForm().toString());
                         }
                     }
-                    return Result.ok(errorCanSaveVOList);
+                    return Result.result(errorCanSaveVOList);
                 }
             }
         }
@@ -1256,7 +1256,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
 //                                }
 //
 //                            }
-                            return Result.ok(errorCanSaveVOList);
+                            return Result.result(errorCanSaveVOList);
                         }
 
                     }
@@ -1463,7 +1463,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                             return result;
                         }
                         if (!CollectionUtils.isEmpty(errorCanSaveVOList)){
-                            return Result.ok(errorCanSaveVOList);
+                            return Result.result(errorCanSaveVOList);
                         }
 
                     }
@@ -1596,7 +1596,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                     customerMailBingMarkService.updateCustomerMailBingMark(customerId,cmails,liasionId,lmails);
                 }
             }
-            return Result.ok("修改成功");
+            return Result.result("修改成功");
         }
         return Result.error("修改失败！");
     }
@@ -2068,7 +2068,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
             }
             assembleService.sendCustomerEventMessages(customerMergeDTO.getFromId(),"CUSTOMER_MERGE");
 
-            return Result.ok("客户合并成功");
+            return Result.result("客户合并成功");
         }
         return Result.error("客户合并失败！");
     }
@@ -2127,7 +2127,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
             //发送消息
             assembleService.sendCustomerEventMessages(customerConvert.getId(),"CONVERT_TO_CUSTOMER");
 
-            return Result.ok("转为客户成功");
+            return Result.result("转为客户成功");
 
         }
         return Result.error("转为客户失败！");
@@ -2219,7 +2219,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                 }
                 customerOwnerService.save(customerOwnerRecord);
             }
-            return Result.ok("领取成功");
+            return Result.result("领取成功");
         }
         return Result.error("领取失败");
     }
@@ -2298,7 +2298,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                 }
                 customerOwnerService.save(customerOwnerRecord);
             }
-            return Result.ok("分配成功");
+            return Result.result("分配成功");
         }
         return Result.error("分配失败");
     }
@@ -2385,7 +2385,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                 customerOwnerService.save(customerOwnerRecord);
             }
 
-            return Result.ok("置公成功");
+            return Result.result("置公成功");
         }
         return Result.error("置公失败");
     }
@@ -2474,7 +2474,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                 followCustomerIdList.addAll(taskCustomerIds);
             }
             if (CollectionUtils.isEmpty(followCustomerIdList)){
-                return Result.ok(pageVO);
+                return Result.result(pageVO);
             }
             wrapper.in(CustomerEntity::getId,followCustomerIdList);
 
@@ -2532,7 +2532,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                 List<Long> customerIds = liaisonEntityList.stream().map(LiaisonEntity::getCustomerId).collect(Collectors.toList());
                 wrapper.in(CustomerEntity::getId,customerIds);
             }else {
-                return Result.ok(pageVO);
+                return Result.result(pageVO);
             }
         }
         wrapper.eq( CustomerEntity::getIsDelete,CommonConstant.DEL_FLAG_0);
@@ -2581,7 +2581,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
 //                List<CustomerUserFollowEntity> customerUserFollowEntityList = customerUserFollowService.list(new LambdaQueryWrapper<CustomerUserFollowEntity>().eq(CustomerUserFollowEntity::getUserId,loginUser.getId()));
 //                List<Long> customerIdList = customerUserFollowEntityList.stream().map(CustomerUserFollowEntity::getCustomerId).collect(Collectors.toList());
 //                if (CollectionUtils.isEmpty(customerIdList)){
-//                    return Result.ok(pageVO);
+//                    return Result.result(pageVO);
 //                }
 //                wrapper.in(CustomerEntity::getId,customerIdList);
                 wrapper.eq(CustomerEntity::getHasFollowCustomer,true);
@@ -2592,7 +2592,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
                 //下属协作的
                 List<Long> subUserIds = userService.getAllSubordinate(loginUser.getId());
                 if (CollectionUtils.isEmpty(subUserIds)){
-                    return Result.ok(pageVO);
+                    return Result.result(pageVO);
                 }
                 wrapper.and(queryWrapper1->queryWrapper1.apply("CONCAT(',',collaborator,',') REGEXP ',"+concatRegexp(subUserIds)+",'"));
             } else if(QueryRangeTypeEnum.QUERY_TRANSFERRED_CUSTOMER_SQL.getCode().equals(customerSearchDTO.getQueryRangeType())){
@@ -2656,7 +2656,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
 //      }
 
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
 //        List<CustomerListVO> customerListVO = new ArrayList<>();
         //复制list给VO类
@@ -2705,7 +2705,7 @@ public class CustomerServiceImpl extends MyBaseServiceImpl<CustomerMapper, Custo
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/CustomerUserFollowServiceImpl.java

@@ -33,14 +33,14 @@ public class CustomerUserFollowServiceImpl extends MyBaseServiceImpl<CustomerUse
         queryWrapper.eq(CustomerUserFollowEntity::getUserId, LoginUserUtil.getCurrentUserId());
         List<CustomerUserFollowEntity> customerUserFollowEntities = this.list(queryWrapper);
         if (!CollectionUtils.isEmpty(customerUserFollowEntities)){
-            return Result.ok("已重点关注");
+            return Result.result("已重点关注");
         }
         CustomerUserFollowEntity customerUserFollowEntity = new CustomerUserFollowEntity();
         customerUserFollowEntity.setCustomerId(businessAddOrDeleteDTO.getCustomerId());
         customerUserFollowEntity.setUserId(LoginUserUtil.getCurrentUserId());
         boolean isOk = this.save(customerUserFollowEntity);
         if (isOk){
-            return Result.ok("已重点关注");
+            return Result.result("已重点关注");
         }
         return Result.error("关注失败");
     }
@@ -53,7 +53,7 @@ public class CustomerUserFollowServiceImpl extends MyBaseServiceImpl<CustomerUse
         wrapper.eq(CustomerUserFollowEntity::getUserId,LoginUserUtil.getCurrentUserId());
         int count = baseMapper.delete(wrapper);
         if (count > 0){
-            return Result.ok("取消关注成功");
+            return Result.result("取消关注成功");
         }
         return Result.error("取消关注失败");
     }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/DynamicLogServiceImpl.java

@@ -46,7 +46,7 @@ public class DynamicLogServiceImpl extends MyBaseServiceImpl<DynamicLogMapper, D
         wrapper.eq(DynamicLogEntity::getRecordId, dynamicLogSearchDTO.getRecordId());
         page = page(page, wrapper);
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
 //        List<CustomerListVO> customerListVO = new ArrayList<>();
         //复制list给VO类
@@ -63,6 +63,6 @@ public class DynamicLogServiceImpl extends MyBaseServiceImpl<DynamicLogMapper, D
                 item.setUserName(createByMap.get(item.getCreateBy()).getRealName());
             });
         }
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/LiaisonServiceImpl.java

@@ -193,7 +193,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
             } else if (!isAdd && Objects.nonNull(oldLiaison) && !CollectionUtils.isEmpty(lmails) && !oldLiaison.getEmail().equals(latest.getEmail())){
                 customerMailBingMarkService.updateCustomerLiaisonMailBingMark(latest.getCustomerId(),latest.getId(),lmails);
             }
-            return Result.ok("操作成功");
+            return Result.result("操作成功");
         }
         return Result.error("处理失败!");
     }
@@ -209,7 +209,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
 
         IPage<LiaisonListVO> pageVO = new Page<>(liaisonSearchDTO.getPageIndex(), liaisonSearchDTO.getPageSize());
         if (liaisonSearchDTO.getCorrelation() == 1 && ObjectUtils.isEmpty(liaisonSearchDTO.getCustomerId())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
         IPage<LiaisonEntity> page = new Page<>(liaisonSearchDTO.getPageIndex(), liaisonSearchDTO.getPageSize());
         LambdaQueryWrapper<LiaisonEntity> wrapper = new LambdaQueryWrapper<>();
@@ -226,7 +226,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
                 List<Long> customerIds = customerEntityList.stream().map(CustomerEntity::getId).collect(Collectors.toList());
                 wrapper.in(LiaisonEntity::getCustomerId,customerIds);
             }else {
-                return Result.ok(pageVO);
+                return Result.result(pageVO);
             }
         }
 
@@ -264,7 +264,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
 
         IPage<LiaisonEntity> pageList = this.pageWithScope(page, wrapper,liaisonSearchDTO,mergeSql.toString());
         if (CollectionUtils.isEmpty(pageList.getRecords())){
-            return Result.ok(pageList);
+            return Result.result(pageList);
         }
         for (LiaisonEntity l : pageList.getRecords()){
             if (l.getHasPrimaryLialison()){
@@ -297,7 +297,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override
@@ -366,7 +366,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
         liaisonResourceWrapper.eq(LiaisonResourceEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
         List<LiaisonResourceEntity> resourceList = liaisonResourceService.list(liaisonResourceWrapper);
         if (CollectionUtils.isEmpty(resourceList)){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
         List<Long> liaisonIdList = resourceList.stream().map(LiaisonResourceEntity::getLiaisonId).collect(Collectors.toList());
 
@@ -387,7 +387,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
         wrapper.orderByDesc(LiaisonEntity::getId);
         IPage<LiaisonEntity> pageList = this.page(page, wrapper);
         if (CollectionUtils.isEmpty(pageList.getRecords())){
-            return Result.ok(pageList);
+            return Result.result(pageList);
         }
 //        List<LiaisonListVO> list = new ArrayList<>();
         //复制list给VO类
@@ -404,7 +404,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override
@@ -424,7 +424,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
                 .set(LiaisonEntity::getHasPrimaryLialison,true);
         boolean update = update(liaisonChangeWrapper);
         if (update){
-            return Result.ok("更新首要联系人成功");
+            return Result.result("更新首要联系人成功");
         }
         return Result.error("更新首要联系人失败");
     }
@@ -544,7 +544,7 @@ public class LiaisonServiceImpl extends MyBaseServiceImpl<LiaisonMapper, Liaison
         LiaisonListVO liaisonListVO = new LiaisonListVO();
         BeanUtils.copyProperties(liaison,liaisonListVO);
         SysBaseField.orgFileds(liaisonListVO);
-        return Result.ok(liaisonListVO);
+        return Result.result(liaisonListVO);
     }
 
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/OrderFormServiceImpl.java

@@ -219,7 +219,7 @@ public class OrderFormServiceImpl extends MyBaseServiceImpl<OrderFormMapper, Ord
             assembleService.sendOrderParentEventMessages(orderFormEntity.getId(),"ADD_ORDER");
         }
 
-        return Result.ok(orderFormEntity.getId());
+        return Result.result(orderFormEntity.getId());
     }
 
     @Override
@@ -336,7 +336,7 @@ public class OrderFormServiceImpl extends MyBaseServiceImpl<OrderFormMapper, Ord
             //发送消息
             assembleService.sendOrderEventMessages(orderFormEntity.getId(),"DATA_CHANGE");
         }
-        return Result.ok(orderFormEntity.getId());
+        return Result.result(orderFormEntity.getId());
     }
 
     @Override
@@ -361,7 +361,7 @@ public class OrderFormServiceImpl extends MyBaseServiceImpl<OrderFormMapper, Ord
                 List<Long> customerIds = customerEntityList.stream().map(CustomerEntity::getId).collect(Collectors.toList());
                 wrapper.in(OrderFormEntity::getCustomerId,customerIds);
             }else {
-                return Result.ok(pageVO);
+                return Result.result(pageVO);
             }
         }
 
@@ -387,7 +387,7 @@ public class OrderFormServiceImpl extends MyBaseServiceImpl<OrderFormMapper, Ord
                 //下属协作的
                 List<Long> subUserIds = userService.getAllSubordinate(loginUser.getId());
                 if (CollectionUtils.isEmpty(subUserIds)){
-                    return Result.ok(pageVO);
+                    return Result.result(pageVO);
                 }
                 wrapper.and(queryWrapper1->queryWrapper1.apply("CONCAT(',',collaborator,',') REGEXP ',"+concatRegexp(subUserIds)+",'"));
             }
@@ -444,7 +444,7 @@ public class OrderFormServiceImpl extends MyBaseServiceImpl<OrderFormMapper, Ord
         }
 
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
         pageVO = SysBaseField.page(page, OrderFormListVO.class);
         SysBaseField.dictFileds(pageVO.getRecords());
@@ -493,7 +493,7 @@ public class OrderFormServiceImpl extends MyBaseServiceImpl<OrderFormMapper, Ord
             }
         }
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/RecordCommentServiceImpl.java

@@ -64,7 +64,7 @@ public class RecordCommentServiceImpl extends MyBaseServiceImpl<RecordCommentMap
             queryWrapper.eq(RecordCommentEntity::getRecordId, recordId);
         }else {
             if (ObjectUtils.isEmpty(dto.getRecordIds())){
-                return Result.ok(result);
+                return Result.result(result);
             }
         }
 
@@ -82,7 +82,7 @@ public class RecordCommentServiceImpl extends MyBaseServiceImpl<RecordCommentMap
         List<RecordCommentEntity> list = pageData.getRecords();
 //        IPage<RecordCommentVO> result = new Page<>(dto.getPageIndex(),dto.getPageSize());
         if (CollectionUtils.isEmpty(list)){
-            return Result.ok(result);
+            return Result.result(result);
         }
 
         List<RecordCommentVO> recordVoList = new ArrayList<>();
@@ -152,7 +152,7 @@ public class RecordCommentServiceImpl extends MyBaseServiceImpl<RecordCommentMap
         result.setRecords(recordVoList);
         SysBaseField.orgFileds(recordVoList);
 
-        return Result.ok(result);
+        return Result.result(result);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/SendRecordServiceImpl.java

@@ -105,7 +105,7 @@ public class SendRecordServiceImpl extends MyBaseServiceImpl<SendRecordMapper, S
 //        wrapper.orderByDesc(SendRecordEntity::getSendRecordTime);
         page = pageWithScope(page, wrapper,sendRecordSearchDTO, mergeSql.toString());
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(page);
+            return Result.result(page);
         }
         DefaultMapperFactory mapperFactory = new DefaultMapperFactory.Builder().build();
         List<SendRecordListVO> sendRecordListVOList = mapperFactory.getMapperFacade().mapAsList(page.getRecords(),SendRecordListVO.class);
@@ -136,7 +136,7 @@ public class SendRecordServiceImpl extends MyBaseServiceImpl<SendRecordMapper, S
         SysBaseField.orgFileds(sendRecordListVOList);
         SysBaseField.dictFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/SysResourceServiceImpl.java

@@ -89,7 +89,7 @@ public class SysResourceServiceImpl extends MyBaseServiceImpl<SysResourceMapper,
 //        page = pageWithScope(page, wrapper,sysResourceSearchDTO,"");
         page = page(page, wrapper);
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
 //        List<CustomerListVO> customerListVO = new ArrayList<>();
         //复制list给VO类
@@ -97,7 +97,7 @@ public class SysResourceServiceImpl extends MyBaseServiceImpl<SysResourceMapper,
 
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
 
@@ -146,7 +146,7 @@ public class SysResourceServiceImpl extends MyBaseServiceImpl<SysResourceMapper,
             sysResourceEntity.setCreateBy(Long.parseLong(loginUser.getId()+""));
             sysResourceEntity.setCreateTime(now());
             boolean save = this.save(sysResourceEntity);
-            return Result.ok(sysResourceEntity);
+            return Result.result(sysResourceEntity);
         }
         return Result.error("上传文件失败,请检查文件是否提交");
     }
@@ -174,7 +174,7 @@ public class SysResourceServiceImpl extends MyBaseServiceImpl<SysResourceMapper,
             boolean isOk = this.saveBatch(sysResourceList);
             if (isOk){
                 List<Long> idList = sysResourceList.stream().map(SysResourceEntity::getId).collect(Collectors.toList());
-                return Result.ok(idList);
+                return Result.result(idList);
             }
         }
 
@@ -201,7 +201,7 @@ public class SysResourceServiceImpl extends MyBaseServiceImpl<SysResourceMapper,
         if (!CollectionUtils.isEmpty(sysResourceList)){
             boolean isOk = this.saveBatch(sysResourceList);
             if (isOk){
-                return Result.ok(sysResourceList);
+                return Result.result(sysResourceList);
             }
         }
         return null;
@@ -229,7 +229,7 @@ public class SysResourceServiceImpl extends MyBaseServiceImpl<SysResourceMapper,
             sysResourceEntity.setCreateBy(Long.parseLong(loginUser.getId()+""));
             sysResourceEntity.setCreateTime(now());
             boolean save1 = this.save(sysResourceEntity);
-            return Result.ok(sysResourceEntity);
+            return Result.result(sysResourceEntity);
         }
         return Result.error("上传文件失败,请检查文件是否提交");
     }
@@ -254,7 +254,7 @@ public class SysResourceServiceImpl extends MyBaseServiceImpl<SysResourceMapper,
         if (!CollectionUtils.isEmpty(sysResourceList)){
             boolean isOk = this.saveBatch(sysResourceList);
             if (isOk){
-                return Result.ok(sysResourceList);
+                return Result.result(sysResourceList);
             }
         }
         return null;
@@ -278,7 +278,7 @@ public class SysResourceServiceImpl extends MyBaseServiceImpl<SysResourceMapper,
            }
             boolean isOk = saveOrUpdateBatch(sysResourceList);
             if (isOk){
-                return Result.ok("上传成功");
+                return Result.result("上传成功");
             }
         return Result.error("上传失败");
     }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/WorkDynamicsServiceImpl.java

@@ -94,7 +94,7 @@ public class WorkDynamicsServiceImpl extends MyBaseServiceImpl<WorkDynamicsMappe
 
         IPage<WorkDynamicsEntity> pageList = this.pageWithScope(page, wrapper,workDynamicsSearchDTO,mergeSql.toString());
         if (CollectionUtils.isEmpty(pageList.getRecords())){
-            return Result.ok(pageList);
+            return Result.result(pageList);
         }
         //去除内容和标题的html标签
 //        pageList.getRecords().forEach(e->{
@@ -127,6 +127,6 @@ public class WorkDynamicsServiceImpl extends MyBaseServiceImpl<WorkDynamicsMappe
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/WorkOrderServiceImpl.java

@@ -139,14 +139,14 @@ public class WorkOrderServiceImpl extends MyBaseServiceImpl<WorkOrderMapper, Wor
         }
         page = pageWithScope(page, wrapper);
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
 //        List<CustomerListVO> customerListVO = new ArrayList<>();
         //复制list给VO类
         pageVO = SysBaseField.page(page, WorkOrderListVO.class);
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/customer/WorkOrderViewLogServiceImpl.java

@@ -81,7 +81,7 @@ public class WorkOrderViewLogServiceImpl extends MyBaseServiceImpl<WorkOrderView
         wrapper.eq(WorkOrderViewLogEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
         page = page(page, wrapper);
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
 //        List<CustomerListVO> customerListVO = new ArrayList<>();
         //复制list给VO类
@@ -89,6 +89,6 @@ public class WorkOrderViewLogServiceImpl extends MyBaseServiceImpl<WorkOrderView
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/sku/QuotationServiceImpl.java

@@ -429,7 +429,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
         LambdaQueryWrapper<QuotationEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(QuotationEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
         if (ObjectUtils.isEmpty(quotationListDTO.getCustomerId()) && ObjectUtils.isEmpty(quotationListDTO.getOwnerBy())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
         wrapper.eq(!ObjectUtils.isEmpty(quotationListDTO.getCustomerId()),QuotationEntity::getCustomerId, quotationListDTO.getCustomerId());
         wrapper.eq(!ObjectUtils.isEmpty(quotationListDTO.getOwnerBy()),QuotationEntity::getOwnerBy,quotationListDTO.getOwnerBy());
@@ -447,7 +447,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             page = page(page, wrapper);
         }
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
 
         pageVO = SysBaseField.page(page, QuotationListVO.class);
@@ -483,7 +483,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
         });
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override
@@ -532,7 +532,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             //国内总价（含税）
             return this.cnyPriceTotalRate(quotationPriceDTO);
         }
-        return Result.ok(new QuotationPriceVO());
+        return Result.result(new QuotationPriceVO());
     }
 
     private Result<?> cnyPriceTotalRate(QuotationPriceDTO quotationPriceDTO) {
@@ -551,7 +551,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             quotationPriceVO.setSkuPriceCNYWithNoRateActual(skuPriceCNYWithNoRateActual.setScale(2, BigDecimal.ROUND_HALF_UP));
             quotationPriceVO.setSkuPriceUSDActual(skuPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
         }
-        return Result.ok(quotationPriceVO);
+        return Result.result(quotationPriceVO);
     }
 
     private Result<?> cnyPriceRate(QuotationPriceDTO quotationPriceDTO) {
@@ -580,7 +580,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             quotationPriceVO.setUnitPriceUSDActual(unitPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
             quotationPriceVO.setSkuPriceUSDActual(skuPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
         }
-        return Result.ok(quotationPriceVO);
+        return Result.result(quotationPriceVO);
     }
 
 
@@ -602,7 +602,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             quotationPriceVO.setUnitPriceUSDActual(unitPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
             quotationPriceVO.setSkuPriceUSDActual(skuPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
         }
-        return Result.ok(quotationPriceVO);
+        return Result.result(quotationPriceVO);
     }
 
     private Result<?> usdPrice(QuotationPriceDTO quotationPriceDTO) {
@@ -625,7 +625,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             quotationPriceVO.setUnitPriceUSDActual(unitPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
             quotationPriceVO.setSkuPriceUSDActual(skuPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
         }
-        return Result.ok(quotationPriceVO);
+        return Result.result(quotationPriceVO);
     }
 
     private Result<?> cnyPriceTotal(QuotationPriceDTO quotationPriceDTO) {
@@ -642,7 +642,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             quotationPriceVO.setSkuPriceCNYWithNoRateActual(skuPriceCNYWithNoRateActual.setScale(2, BigDecimal.ROUND_HALF_UP));
             quotationPriceVO.setSkuPriceUSDActual(skuPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
         }
-        return Result.ok(quotationPriceVO);
+        return Result.result(quotationPriceVO);
     }
 
     private Result<?> usdPriceTotal(QuotationPriceDTO quotationPriceDTO) {
@@ -659,7 +659,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             quotationPriceVO.setSkuPriceCNYWithNoRateActual(skuPriceCNYWithNoRateActual.setScale(2, BigDecimal.ROUND_HALF_UP));
             quotationPriceVO.setSkuPriceUSDActual(skuPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP));
         }
-        return Result.ok(quotationPriceVO);
+        return Result.result(quotationPriceVO);
     }
 
     @Override
@@ -672,7 +672,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
             skuPriceUSDActual = skuPriceUSDActual.setScale(2, BigDecimal.ROUND_HALF_UP);
             quotationPriceVO.setSkuPriceUSDActual(skuPriceUSDActual);
         }
-        return Result.ok(quotationPriceVO);
+        return Result.result(quotationPriceVO);
     }
 
     @Override
@@ -693,7 +693,7 @@ public class QuotationServiceImpl extends MyBaseServiceImpl<QuotationMapper, Quo
         }
         Long id = quotation.getId();
         QuotationDetailVO quotationDetailVO = getQuotationDetailVOById(id);
-        return Result.ok(quotationDetailVO);
+        return Result.result(quotationDetailVO);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/sku/SsdProductServiceImpl.java

@@ -34,7 +34,7 @@ public class SsdProductServiceImpl extends ServiceImpl<SsdProductMapper, SsdProd
         page.setRecords(baseMapper.queryProductPageList(ssdProductVO));
         page.setTotal(baseMapper.queryProductTotal(ssdProductVO));
 
-        return Result.ok(page);
+        return Result.result(page);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/sku/SsdProductTypeServiceImpl.java

@@ -42,7 +42,7 @@ public class SsdProductTypeServiceImpl extends ServiceImpl<SsdProductTypeMapper,
         resultMap.put("totalCount", list.size());
         resultMap.put("productTypeList", list);
 
-        return Result.ok(resultMap);
+        return Result.result(resultMap);
     }
 
     @Override
@@ -55,7 +55,7 @@ public class SsdProductTypeServiceImpl extends ServiceImpl<SsdProductTypeMapper,
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("productType", ssdProduct);
 
-        return Result.ok(resultMap);
+        return Result.result(resultMap);
     }
 
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/sku/SsdSkuServiceImpl.java

@@ -76,13 +76,13 @@ public class SsdSkuServiceImpl extends ServiceImpl<SsdSkuMapper, SsdSku> impleme
         }
         page.setRecords(ssdSkuVOList);
         page.setTotal(baseMapper.total(ssdSku));
-        return Result.ok(page);
+        return Result.result(page);
     }
 
     @Override
     public Result detail(SsdSkuVO ssdSkuVO) {
 
-        return Result.ok(baseMapper.detail(ssdSkuVO));
+        return Result.result(baseMapper.detail(ssdSkuVO));
     }
 
     @Override
@@ -96,7 +96,7 @@ public class SsdSkuServiceImpl extends ServiceImpl<SsdSkuMapper, SsdSku> impleme
         jsonObject.put("productLevel", baseMapper.queryDataDictCodeList(SsdProductConstants.SSD_PRODUCT_LEVEL));
         jsonObject.put("flashChipType", baseMapper.queryDataDictCodeList(SsdProductConstants.SSD_PRODUCT_FLASH_CHIP_TYPE));
         jsonObject.put("capacity", baseMapper.queryDataDictCodeList(SsdProductConstants.SSD_PRODUCT_CAPACITY));
-        return Result.ok(jsonObject);
+        return Result.result(jsonObject);
 
     }
 
@@ -263,7 +263,7 @@ public class SsdSkuServiceImpl extends ServiceImpl<SsdSkuMapper, SsdSku> impleme
 
         long endTime = System.currentTimeMillis();
         log.info(">>>>> MakeQuotationSkuDetailCNENVO end run time :{} ms", (endTime - startTime));
-        return Result.ok(resultMap);
+        return Result.result(resultMap);
     }
 
     public Result ssdStepOneGetSkuDetailDownload(MakeQuotationSkuDetailCNENVO skuDetailParams){
@@ -404,7 +404,7 @@ public class SsdSkuServiceImpl extends ServiceImpl<SsdSkuMapper, SsdSku> impleme
 
         long endTime = System.currentTimeMillis();
         log.info(">>>>> MakeQuotationSkuDetailCNENVO end run time :{} ms", (endTime - startTime));
-        return Result.ok(resultMap);
+        return Result.result(resultMap);
     }
 
     @Override
@@ -592,7 +592,7 @@ public class SsdSkuServiceImpl extends ServiceImpl<SsdSkuMapper, SsdSku> impleme
 
         // 生成报价单
         // sku文件下载
-        return Result.ok(quotationFile);
+        return Result.result(quotationFile);
     }
 
     /**

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/systemrule/ApproveServiceImpl.java

@@ -149,12 +149,12 @@ public class ApproveServiceImpl extends MyBaseServiceImpl<ApproveMapper, Approve
         Result nextResult  = approveApprove(approve);
 
         if (nextResult.getCode()==1000){
-            return Result.ok("提交审核成功");
+            return Result.result("提交审核成功");
         }
 
 //        corpWeChatService.sendTextCardMsg(msgTitle, noticeMsg, url, Set.of(currentApproveUser), null);
 //        corpWeChatService.sendTextCardMsg(msgTitle, noticeMsg, toFinalUrl(url), userList, null);
-        return Result.ok("提交审核成功");
+        return Result.result("提交审核成功");
     }
 
     //薪资调整添加审批逻辑
@@ -259,7 +259,7 @@ public class ApproveServiceImpl extends MyBaseServiceImpl<ApproveMapper, Approve
         noApproveEntity.setApproveContent("系统自动审批");
         Result nextResult  = approveApprove(noApproveEntity);
         if (nextResult.getCode()==1000){
-            return Result.ok("提交审核成功");
+            return Result.result("提交审核成功");
         }
         //消息接收人列表
         List<Long> sendUserIds = Arrays.stream(firstApproveNode.getSendUserids().split(","))
@@ -267,7 +267,7 @@ public class ApproveServiceImpl extends MyBaseServiceImpl<ApproveMapper, Approve
                 .collect(Collectors.toList());
         List<UserEntity> userList = userService.listByIds(sendUserIds);
 //        corpWeChatService.sendTextCardMsg(msgTitle, noticeMsg, toFinalUrl(url), userList, null);
-        return Result.ok("提交审核成功");
+        return Result.result("提交审核成功");
     }
 
     @Override
@@ -381,7 +381,7 @@ public class ApproveServiceImpl extends MyBaseServiceImpl<ApproveMapper, Approve
                 }
             }
         }
-        return Result.ok("审核成功");
+        return Result.result("审核成功");
     }
 
     /***
@@ -447,7 +447,7 @@ public class ApproveServiceImpl extends MyBaseServiceImpl<ApproveMapper, Approve
             return Result.error("审批流撤回日志写入失败");
         }
 
-        return Result.ok("撤回成功");
+        return Result.result("撤回成功");
     }
 
 
@@ -461,7 +461,7 @@ public class ApproveServiceImpl extends MyBaseServiceImpl<ApproveMapper, Approve
 //        }
 //        page.setRecords(approveMapper.listApprovePaySlipByUserId(approve, loginUser.getId()));
 //        page.setTotal(approveMapper.listApprovePaySlipByUserIdCount(approve, loginUser.getId()));
-//        return Result.ok(page);
+//        return Result.result(page);
 //    }
 //
 //    @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/systemrule/OperationLogServiceImpl.java

@@ -79,7 +79,7 @@ public class OperationLogServiceImpl extends MyBaseServiceImpl<OperationLogMappe
         wrapper.eq(!ObjectUtils.isEmpty(operationLogSearchDTO.getResourceTypeId()),OperationLogEntity::getResourceTypeId, operationLogSearchDTO.getResourceTypeId());
         page = pageWithScope(page, wrapper,operationLogSearchDTO,"");
         if (CollectionUtils.isEmpty(page.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
 //        List<CustomerListVO> customerListVO = new ArrayList<>();
         //复制list给VO类
@@ -110,6 +110,6 @@ public class OperationLogServiceImpl extends MyBaseServiceImpl<OperationLogMappe
         }
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/systemrule/SystemRuleModuleConfigServiceImpl.java

@@ -119,7 +119,7 @@ public class SystemRuleModuleConfigServiceImpl extends MyBaseServiceImpl<SystemR
         }
         systemRuleModuleConfigDetileVO.dictFiled();
         systemRuleModuleConfigDetileVO.orgFiled();
-        return Result.ok(systemRuleModuleConfigDetileVO);
+        return Result.result(systemRuleModuleConfigDetileVO);
     }
 
     @Override

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/target/TargetPlanServiceImpl.java

@@ -1433,14 +1433,14 @@ public class TargetPlanServiceImpl extends MyBaseServiceImpl<TargetPlanMapper, T
         wrapper.eq(!ObjectUtils.isEmpty(targetPlanSearchDTO.getType()), TargetPlanEntity::getType, targetPlanSearchDTO.getType());
         IPage<TargetPlanEntity> pageList = this.pageWithScope(page, wrapper,targetPlanSearchDTO,"");
         if (CollectionUtils.isEmpty(pageList.getRecords())){
-            return Result.ok(pageList);
+            return Result.result(pageList);
         }
         //复制list给VO类
         pageVO = SysBaseField.page(page, TargetPlanListVO.class);
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override
@@ -1454,7 +1454,7 @@ public class TargetPlanServiceImpl extends MyBaseServiceImpl<TargetPlanMapper, T
             BeanUtils.copyProperties(targetPlanEntity,targetPlanVO);
             SysBaseField.dictFiled(targetPlanVO);
             SysBaseField.orgFileds(targetPlanVO);
-            return Result.ok(targetPlanVO);
+            return Result.result(targetPlanVO);
         }
         return null;
     }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/service/impl/target/TargetQuotaServiceImpl.java

@@ -1659,10 +1659,10 @@ public class TargetQuotaServiceImpl extends MyBaseServiceImpl<TargetQuotaMapper,
         //查询权限范围
         Set<Long> dataIdSet = userRoleService.dataSelete(OrganizationalTypeEnum.getEnumByCode(targetQuotaSearchDTO.getOrganizationalType()));
 //        if (null == dataIdSet){
-//            return Result.ok(pageVO);
+//            return Result.result(pageVO);
 //        }
         if (CollectionUtils.isEmpty(dataIdSet)){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
         List<Long> dataIdList = new ArrayList<>(dataIdSet);
         targetQuotaSearchDTO.setOrganizationalIds(dataIdList);
@@ -1692,7 +1692,7 @@ public class TargetQuotaServiceImpl extends MyBaseServiceImpl<TargetQuotaMapper,
 //            }
             List<TargetPlanEntity> targetPlanList = targetPlanService.list(tpWrapper);
             if (CollectionUtils.isEmpty(targetPlanList)) {
-                return Result.ok(pageVO);
+                return Result.result(pageVO);
             }
             targetPlanIdList = targetPlanList.stream().map(TargetPlanEntity::getId).collect(Collectors.toList());
         }
@@ -1710,7 +1710,7 @@ public class TargetQuotaServiceImpl extends MyBaseServiceImpl<TargetQuotaMapper,
         wrapper.orderByDesc(TargetQuotaEntity::getId);
         IPage<TargetQuotaEntity> pageList = this.page(page, wrapper);
         if (CollectionUtils.isEmpty(pageList.getRecords())){
-            return Result.ok(pageList);
+            return Result.result(pageList);
         }
         //复制list给VO类
         pageVO = SysBaseField.page(page, TargetQuotaListVO.class);
@@ -1770,7 +1770,7 @@ public class TargetQuotaServiceImpl extends MyBaseServiceImpl<TargetQuotaMapper,
         SysBaseField.dictFileds(pageVO.getRecords());
         SysBaseField.orgFileds(pageVO.getRecords());
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
 //    private Set<Long> dataSelete(Integer organizationalType) {
@@ -1980,7 +1980,7 @@ public class TargetQuotaServiceImpl extends MyBaseServiceImpl<TargetQuotaMapper,
             targetQuotaVO.setTargetQuotaList(this.getTargetQuotaVOC(targetQuotaEntity,targetPlanEntity));
 
         }
-        return Result.ok(targetQuotaVO);
+        return Result.result(targetQuotaVO);
     }
 
     private List<TargetQuotaDetailsListVO> getTargetQuotaVOA(TargetQuotaEntity targetQuotaEntity, TargetPlanEntity targetPlanEntity) {

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/CustomerAiAnalysisController.java

@@ -40,7 +40,7 @@ public class CustomerAiAnalysisController {
         }
         CustomerAnalysisResultEntity result = customerAiAnalysisService
                 .analyzeSingleCustomer(request.getCustomerId(), request.getAnalysisScene());
-        return Result.ok(result);
+        return Result.result(result);
     }
 
     @RequestMapping("/list")
@@ -72,7 +72,7 @@ public class CustomerAiAnalysisController {
         wrapper.orderByDesc(CustomerAnalysisResultEntity::getAnalysisTime);
         // 分页查询
         IPage<CustomerAnalysisResultEntity> iPage = customerAnalysisResultEntityService.page(page, wrapper);
-        return Result.ok(page);
+        return Result.result(page);
     }
 
     @PostMapping(value = "/add")
@@ -85,7 +85,7 @@ public class CustomerAiAnalysisController {
         if (!isOk) {
             return Result.error("添加失败");
         }
-        return Result.ok(entity);
+        return Result.result(entity);
     }
 
     @PostMapping(value = "/edit")
@@ -101,7 +101,7 @@ public class CustomerAiAnalysisController {
         if (!isOk) {
             return Result.error("修改失败");
         }
-        return Result.ok(entity);
+        return Result.result(entity);
     }
 
     @PostMapping(value = "/delete")

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/MarketingController.java

@@ -28,7 +28,7 @@ public class MarketingController {
     public Result<Object> list(@RequestBody MarketingCampaignDTO marketingCampaignDTO) {
 
         Result<Object> result = marketingService.getList(marketingCampaignDTO);
-        return Result.ok(result);
+        return Result.result(result);
     }
 
     @PostMapping(value = "/add")
@@ -36,7 +36,7 @@ public class MarketingController {
     @Transactional(rollbackFor = Throwable.class)
     public Result<?> add(@RequestBody MarketingCampaignDTO marketingCampaignDTO) {
         Result<Object> result = marketingService.addMarket(marketingCampaignDTO);
-        return Result.ok(result);
+        return Result.result(result);
     }
 
     @PostMapping(value = "/edit")
@@ -44,7 +44,7 @@ public class MarketingController {
     @Transactional(rollbackFor = Throwable.class)
     public Result<?> edit(@RequestBody MarketingCampaignDTO marketingCampaignDTO) {
         Result<Object> result = marketingService.editMarket(marketingCampaignDTO);
-        return Result.ok(result);
+        return Result.result(result);
     }
 
     @PostMapping(value = "/delete")

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/SopController.java

@@ -58,7 +58,7 @@ public class SopController {
             @PathVariable Long id) {
         try {
             SopResponseDTO detail = sopService.getSopDetail(id);
-            return Result.ok(detail);
+            return Result.result(detail);
         } catch (Exception e) {
             log.error("查询SOP详情失败, ID: {}", id, e);
             return Result.error("查询失败: " );
@@ -76,7 +76,7 @@ public class SopController {
     public Result<Object> listSop(@RequestBody SopResponseDTO dto) {
         try {
             IPage<SopResponseDTO> page = sopService.listSopPage(dto);
-            return Result.ok(page);
+            return Result.result(page);
         } catch (Exception e) {
             log.error("查询SOP列表失败", e);
             return Result.error("查询失败");

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignEntityServiceImpl.java

@@ -48,7 +48,7 @@ public class MarketingCampaignEntityServiceImpl
 //        List<MarketingCampaignEntity> list = this.list(queryWrapper);
         pageVO = SysBaseField.page(pageList, MarketingCampaignVO.class);
         if (CollectionUtils.isEmpty(pageList.getRecords())){
-            return Result.ok(pageVO);
+            return Result.result(pageVO);
         }
         List<MarketingCampaignVO> marketingCampaignVOList = pageVO.getRecords();
 
@@ -73,7 +73,7 @@ public class MarketingCampaignEntityServiceImpl
             marketingCampaignVOList.get(i).setCustomerList(customerAnalysisResultEntityListI);
         }
 
-        return Result.ok(pageVO);
+        return Result.result(pageVO);
     }
 
     @Override

java/storlead-sms/storlead-sms-api/src/main/java/com/storlead/sms/api/SmsCaptchaApiController.java

@@ -37,7 +37,7 @@ public class SmsCaptchaApiController {
         if (s == null) {
             return Result.error("不支持的场景: " + scene);
         }
-        return Result.ok(smsCaptchaService.sendCaptcha(mobile, s));
+        return Result.result(smsCaptchaService.sendCaptcha(mobile, s));
     }
 
     @ApiOperation("校验验证码")
@@ -54,7 +54,7 @@ public class SmsCaptchaApiController {
         if (s == null) {
             return Result.error("不支持的场景: " + scene);
         }
-        return Result.ok(smsCaptchaService.verifyCaptcha(mobile, code, s, consume));
+        return Result.result(smsCaptchaService.verifyCaptcha(mobile, code, s, consume));
     }
 
     private static SmsCaptchaScene parseScene(String scene) {

java/storlead-system/sql/20260519_role_add_app_id.sql

@@ -1,8 +0,0 @@
--- 角色表增加所属应用标记（对应 RoleEntity.appId / sys_app.id）
-ALTER TABLE `role`
-    ADD COLUMN `app_id` BIGINT NULL DEFAULT NULL COMMENT '所属应用ID，对应 sys_app.id' AFTER `remark`;
-
--- 历史数据：可按业务将已有角色归属主应用（0），需要时再执行
--- UPDATE `role` SET `app_id` = 0 WHERE `app_id` IS NULL;
-
-CREATE INDEX `idx_role_app_id` ON `role` (`app_id`);

java/storlead-system/sql/agent_prompt_template.sql

@@ -1,19 +0,0 @@
--- AI 提示词模板表
-CREATE TABLE IF NOT EXISTS `agent_prompt_template` (
-  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键id',
-  `template_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '模板名称',
-  `template_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '模板code',
-  `app_id` bigint DEFAULT NULL COMMENT '所属应用ID，对应 sys_app.id',
-  `prompt_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'prompt 内容',
-  `create_by` bigint DEFAULT NULL COMMENT '创建者',
-  `owner_by` bigint DEFAULT '0' COMMENT '拥有者',
-  `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint DEFAULT NULL COMMENT '更新者',
-  `update_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
-  `is_delete` int DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-  `enabled` int NOT NULL DEFAULT '1' COMMENT '是否启用:1:启用,0:不启用',
-  `sort` int NOT NULL DEFAULT '0' COMMENT '显示顺序',
-  PRIMARY KEY (`id`) USING BTREE,
-  KEY `idx_agent_prompt_template_code` (`template_code`),
-  KEY `idx_agent_prompt_template_app_id` (`app_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='ai提示词模板';

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/AgentPromptTemplateApiController.java

@@ -57,7 +57,7 @@ public class AgentPromptTemplateApiController {
         if (one == null) {
             return Result.error("模板不存在或已删除");
         }
-        return Result.ok(one);
+        return Result.result(one);
     }
 
     @ApiOperation("按模板编码查询（启用且未删除）")
@@ -68,7 +68,7 @@ public class AgentPromptTemplateApiController {
         if (one == null) {
             return Result.error("未找到对应的AI提示词模板");
         }
-        return Result.ok(one);
+        return Result.result(one);
     }
 
     @ApiOperation("获取渲染后的 prompt 内容")

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/CompanyApiController.java

@@ -69,7 +69,7 @@ public class CompanyApiController {
     public Result save(CompanyDTO param) {
         IPage<CompanyEntity> page = new Page<>(param.getPageIndex(),param.getPageSize());
         IPage<CompanyEntity> companys = companyService.page(page);
-        return Result.ok(companys);
+        return Result.result(companys);
     }
 
     @ApiOperation("删除总公司信息")

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/CompanyCustomSettingsController.java

@@ -60,6 +60,6 @@ public class CompanyCustomSettingsController {
     })
     public Result<?> getSetting() {
         CompanyCustomSettingsEntity setting = customSettingsService.getOne(null);
-        return Result.ok(setting);
+        return Result.result(setting);
     }
 }

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/DeptApiController.java

@@ -82,7 +82,7 @@ public class DeptApiController {
         deptQquery.eq(DeptEntity::getIsDelete,0);
         deptQquery.eq(DeptEntity::getSubCompanyId,subCompanyId);
         List<DeptEntity> deptList = departService.list(deptQquery);
-        return Result.ok(deptList);
+        return Result.result(deptList);
     }
 
     @ApiOperation("获取组织树")
@@ -195,7 +195,7 @@ public class DeptApiController {
             newTrees.add(d);
         }
         List<DepartmentTree> result =  createTreels(newTrees,pidls);;
-        return Result.ok(result);
+        return Result.result(result);
     }
 
 
@@ -299,7 +299,7 @@ public class DeptApiController {
             newTrees.add(d);
         }
         List<DepartmentTree> result =  createTreels(newTrees,pidls);;
-        return Result.ok(result);
+        return Result.result(result);
     }
 
     public Set<Long> getParentDeptsForMultiple(Set<Long> deptIds, Map<Long, DeptEntity> allDepts) {
@@ -473,7 +473,7 @@ public class DeptApiController {
     public Result save(CompanyDTO param) {
         IPage<DeptEntity> page = new Page<>(param.getPageIndex(),param.getPageSize());
         IPage<DeptEntity> depts = departService.page(page);
-        return Result.ok(depts);
+        return Result.result(depts);
     }
 
     @ApiOperation("删除部门数据")

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/FileResourceController.java

@@ -353,7 +353,7 @@ public class FileResourceController {
 //    public Result deleteByPath(String filePathName) {
 //        // String filePathName = "group1/M00/00/00/wKhjZF3WEDmAPSglAABSZAhj0eU111.jpg" ;
 //        fileResourceService.deleteFile(filePathName);
-//        return Result.ok("删除成功");
+//        return Result.result("删除成功");
 //    }
 
 }

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/JobApiController.java

@@ -50,7 +50,7 @@ public class JobApiController {
         queryWrapper.eq(JobEntity::getEnabled,1);
         queryWrapper.orderByAsc(JobEntity::getSort);
         IPage<JobEntity> jobs = jobService.page(page,queryWrapper);
-        return Result.ok(jobs);
+        return Result.result(jobs);
     }
 
     @ApiOperation("岗位查询")
@@ -64,7 +64,7 @@ public class JobApiController {
         queryWrapper.eq(JobEntity::getEnabled,1);
         queryWrapper.orderByAsc(JobEntity::getSort);
         List<JobEntity> jobs = jobService.list(queryWrapper);
-        return Result.ok(jobs);
+        return Result.result(jobs);
     }
 
     @ApiOperation("保存岗位")

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/MenuApiController.java

@@ -74,11 +74,11 @@ public class MenuApiController {
             queryWrapper.orderByAsc(MenuEntity::getSort);
             List<MenuEntity> menus = menuService.list(queryWrapper);
             if(CollectionUtils.isEmpty(menus)) {
-                return Result.ok(Collections.EMPTY_LIST);
+                return Result.result(Collections.EMPTY_LIST);
             }
             List<UserMenuVO> res = createTreeMenus(Long.valueOf(0), UserMenuVO.menuListToTargetMenuTreeVoList(menus));
             //res.stream().sorted(Comparator.comparing(UserMenuVO::getSort).reversed());
-            return Result.ok(res);
+            return Result.result(res);
         }catch (Exception e) {
             e.printStackTrace();
             return Result.error("获取菜单信息错误:"+e.getMessage());
@@ -96,7 +96,7 @@ public class MenuApiController {
             applyMenuScopeFilter(queryWrapper, dto);
             List<MenuEntity> menus = menuService.list(queryWrapper);
             List<RouterVo> routerVos = menuToRouter(menus);
-            return Result.ok(routerVos);
+            return Result.result(routerVos);
         }catch (Exception e) {
             e.printStackTrace();
             return Result.error("获取菜单信息错误:"+e.getMessage());
@@ -144,7 +144,7 @@ public class MenuApiController {
     @PostMapping(value = {"listResTree", "list_web_h5_res_tree"})
     public Result listResTree(@RequestBody(required = false) MenuParamDTO dto) {
         try {
-            return Result.ok(buildResTree(dto));
+            return Result.result(buildResTree(dto));
         } catch (Exception e) {
             log.error("listResTree error", e);
             return Result.error("获取菜单信息错误:" + e.getMessage());
@@ -183,44 +183,73 @@ public class MenuApiController {
     @PostMapping("pagelist")
     public Result pagelist(@RequestBody MenuParam dto) {
         try {
-            IPage<MenuEntity> page = new Page<>(dto.getPageIndex(),dto.getPageSize());
+            IPage<MenuEntity> page = new Page<>(dto.getPageIndex(), dto.getPageSize());
             LambdaQueryWrapper<MenuEntity> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(MenuEntity::getIsDelete, 0);
-            if (Objects.nonNull(dto)) {
-                if (dto.getServiceModeType() != null) {
-                    queryWrapper.eq(MenuEntity::getServiceModeType, dto.getServiceModeType());
-                }
-                applyAppIdFilter(queryWrapper, parseAppId(dto.getAppId()));
+            if (dto.getServiceModeType() != null) {
+                queryWrapper.eq(MenuEntity::getServiceModeType, dto.getServiceModeType());
             }
-            IPage<MenuEntity> menus = menuService.page(page,queryWrapper);
-            return Result.ok(menus);
-        }catch (Exception e) {
+            applyAppIdFilter(queryWrapper, dto.getAppId());
+            queryWrapper.orderByAsc(MenuEntity::getSort).orderByAsc(MenuEntity::getId);
+            IPage<MenuEntity> menus = menuService.page(page, queryWrapper);
+            return Result.result(menus);
+        } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("获取菜单信息错误:"+e.getMessage());
+            return Result.error("获取菜单信息错误:" + e.getMessage());
         }
     }
 
+    @ApiOperation("菜单详情")
+    @PostMapping("detail")
+    public Result detail(@RequestBody MenuParamDTO dto) {
+        if (dto == null || dto.getId() == null) {
+            return Result.error("参数错误");
+        }
+        LambdaQueryWrapper<MenuEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MenuEntity::getId, dto.getId());
+        queryWrapper.eq(MenuEntity::getIsDelete, 0);
+        applyAppIdFilter(queryWrapper, dto.getAppId());
+        MenuEntity menu = menuService.getOne(queryWrapper);
+        if (menu == null) {
+            return Result.error("菜单不存在或不在当前应用范围内");
+        }
+        return Result.result(menu);
+    }
+
     @ApiOperation("保存菜单")
     @PostMapping("save")
     public Result save(@RequestBody MenuEntity menu) {
         if (Objects.isNull(menu.getPid())) {
             menu.setPid(0L);
         }
+        resolveMenuAppId(menu);
         if (Long.valueOf(0L).equals(menu.getPid()) && menu.getAppId() == null) {
             return Result.error("顶级菜单(pid=0)必须指定 appId");
         }
         convertMenuCode(menu);
-        return Result.ok(menuService.saveOrUpdate(menu));
+        return Result.result(menuService.saveOrUpdate(menu));
     }
 
     @ApiOperation("删除菜单")
     @PostMapping("delete")
-    public Result remove(@NotNull @NotEmpty Long[] ids) {
-        List<MenuEntity> menus = menuService.list(new LambdaQueryWrapper<MenuEntity>().in(MenuEntity::getPid,ids));
+    public Result remove(@NotNull @NotEmpty Long[] ids, Long appId) {
+        List<MenuEntity> toDelete = menuService.list(new LambdaQueryWrapper<MenuEntity>()
+                .in(MenuEntity::getId, Arrays.asList(ids))
+                .eq(MenuEntity::getIsDelete, 0));
+        if (CollectionUtils.isEmpty(toDelete)) {
+            return Result.error("菜单不存在或已删除");
+        }
+        if (appId != null) {
+            boolean outOfApp = toDelete.stream().anyMatch(m -> !appId.equals(m.getAppId()));
+            if (outOfApp) {
+                return Result.error("存在不属于当前应用的菜单，无法删除");
+            }
+        }
+        List<MenuEntity> menus = menuService.list(new LambdaQueryWrapper<MenuEntity>().in(MenuEntity::getPid, ids));
         if (!CollectionUtils.isEmpty(menus)) {
-            List idls = Arrays.asList(ids);
+            List<Long> idls = Arrays.asList(ids);
             for (MenuEntity menu : menus) {
-                if (!idls.contains(menu.getId())){
+                if (!idls.contains(menu.getId())) {
                     return Result.error("请先删除子节点");
                 }
             }
@@ -253,7 +282,7 @@ public class MenuApiController {
 
         if (StrUtil.isBlank(info.getMenuCode())) {
             String routeCode = getInitials(info.getMenuName());
-            MenuEntity menu = menuService.getRootLastNodeInfo(info.getPid());
+            MenuEntity menu = menuService.getRootLastNodeInfo(info.getPid(), info.getAppId());
             String lastCode;
             if (menu == null) {
                 info.setPid(Long.valueOf(0));
@@ -267,8 +296,12 @@ public class MenuApiController {
 
     @ApiOperation("处理历史数据code")
     @PostMapping("batch_generate_code")
-    public Result initializeCode() {
-        List<MenuEntity> menuList = menuService.list(new LambdaQueryWrapper<MenuEntity>().in(MenuEntity::getMenuType,Arrays.asList(1,2)));
+    public Result initializeCode(@RequestBody(required = false) MenuParamDTO dto) {
+        LambdaQueryWrapper<MenuEntity> wrapper = new LambdaQueryWrapper<MenuEntity>()
+                .in(MenuEntity::getMenuType, Arrays.asList(1, 2))
+                .eq(MenuEntity::getIsDelete, 0);
+        applyAppIdFilter(wrapper, dto != null ? dto.getAppId() : null);
+        List<MenuEntity> menuList = menuService.list(wrapper);
         Map<Long,MenuEntity> mapMenu = menuList.stream().collect(Collectors.toMap(MenuEntity::getId, a ->a));
         for (MenuEntity info : menuList) {
             String routeCode = getInitials(info.getMenuName());
@@ -283,8 +316,12 @@ public class MenuApiController {
 
     @ApiOperation("处理历史数据code")
     @PostMapping("update_menu_icon")
-    public Result updateMenuIcon() {
-        List<MenuEntity> menuList = menuService.list(new LambdaQueryWrapper<MenuEntity>().eq(MenuEntity::getMenuType,2));
+    public Result updateMenuIcon(@RequestBody(required = false) MenuParamDTO dto) {
+        LambdaQueryWrapper<MenuEntity> wrapper = new LambdaQueryWrapper<MenuEntity>()
+                .eq(MenuEntity::getMenuType, 2)
+                .eq(MenuEntity::getIsDelete, 0);
+        applyAppIdFilter(wrapper, dto != null ? dto.getAppId() : null);
+        List<MenuEntity> menuList = menuService.list(wrapper);
         HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
         format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
         format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
@@ -398,7 +435,7 @@ public class MenuApiController {
 //        List<MenuEntity> menus = menuService.list(queryWrapper);
 //        if (!CollectionUtils.isEmpty(menus)) {
 //            String menuJson = JSON.toJSONString(menus);
-//            return Result.ok(JSONArray.parseArray(menuJson, UserH5MenuVO.class));
+//            return Result.result(JSONArray.parseArray(menuJson, UserH5MenuVO.class));
 //        }
         return Result.ok();
     }
@@ -428,18 +465,23 @@ public class MenuApiController {
 
     @ApiOperation("查询菜单所有菜单")
     @PostMapping("allMenulist")
-    public Result allMenulist(String menuName, Integer[] types, String appId) {
-        if(types == null) {
+    public Result allMenulist(@RequestBody(required = false) MenuParamDTO dto) {
+        if (dto == null) {
+            dto = new MenuParamDTO();
+        }
+        Integer[] types = dto.getMenuTypes();
+        if (types == null || types.length == 0) {
             types = new Integer[]{1, 2};
         }
         try {
-            LambdaQueryWrapper<MenuEntity> queryWrapper = new LambdaQueryWrapper();
-            queryWrapper.eq(MenuEntity::getIsDelete,0);
-            queryWrapper.eq(MenuEntity::getEnabled,1);
+            LambdaQueryWrapper<MenuEntity> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(MenuEntity::getIsDelete, 0);
+            queryWrapper.eq(MenuEntity::getEnabled, 1);
             queryWrapper.in(MenuEntity::getMenuType, Arrays.asList(types));
-            applyAppIdFilter(queryWrapper, appId);
-            queryWrapper.likeLeft(StringUtils.isNotEmpty(menuName), MenuEntity::getMenuName, menuName);
-            queryWrapper.likeRight(StringUtils.isNotEmpty(menuName), MenuEntity::getMenuName, menuName);
+            applyAppIdFilter(queryWrapper, dto.getAppId());
+            if (StringUtils.isNotEmpty(dto.getMenuName())) {
+                queryWrapper.like(MenuEntity::getMenuName, dto.getMenuName());
+            }
             queryWrapper.orderByAsc(MenuEntity::getSort);
             List<MenuEntity> menus = menuService.list(queryWrapper);
             if (!CollectionUtils.isEmpty(menus)) {
@@ -451,7 +493,7 @@ public class MenuApiController {
                 });
             }
 //            List<RouterVo> routerVos = menuToRouter(menus);
-            return Result.ok(menus);
+            return Result.result(menus);
         }catch (Exception e) {
             e.printStackTrace();
             return Result.error("获取菜单信息错误:"+e.getMessage());
@@ -479,20 +521,16 @@ public class MenuApiController {
         }
     }
 
-    private void applyAppIdFilter(LambdaQueryWrapper<MenuEntity> queryWrapper, String appIdRaw) {
-        applyAppIdFilter(queryWrapper, parseAppId(appIdRaw));
-    }
-
-    private Long parseAppId(String appIdRaw) {
-        if (StrUtil.isBlank(appIdRaw)) {
-            return null;
+    /**
+     * 子菜单未传 appId 时继承父级应用。
+     */
+    private void resolveMenuAppId(MenuEntity menu) {
+        if (menu.getAppId() != null || menu.getPid() == null || menu.getPid() <= 0) {
+            return;
         }
-        try {
-            return Long.parseLong(appIdRaw.trim());
-        } catch (NumberFormatException e) {
-            log.warn("非法 appId，已忽略: {}", appIdRaw);
-            return null;
+        MenuEntity parent = menuService.getById(menu.getPid());
+        if (parent != null && parent.getAppId() != null) {
+            menu.setAppId(parent.getAppId());
         }
     }
-
 }

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/PermissionResApiController.java

@@ -69,7 +69,7 @@ public class PermissionResApiController {
             List<RouterVo> treeRouter = new ArrayList<>();
             menuToRouter(menuRes, null, treeRouter);
             map.put("routerVo",treeRouter);
-            return Result.ok(map);
+            return Result.result(map);
         }catch (Exception e) {
             e.printStackTrace();
             return Result.error("获取菜单信息错误:"+e.getMessage());
@@ -103,7 +103,7 @@ public class PermissionResApiController {
                 });
             }
             List<UserMenuVO>  menuRes = createTreeMenus(Long.valueOf(0),menuls);
-            return Result.ok(menuRes);
+            return Result.result(menuRes);
         }catch (Exception e) {
             e.printStackTrace();
             return Result.error("获取菜单信息错误:"+e.getMessage());

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/QuickMenuApiController.java

@@ -84,7 +84,7 @@ public class QuickMenuApiController {
             menuls.add(menuVo);
         });
         List<UserMenuVO>  menuRes = createTreeMenus(Long.valueOf(0),menuls);
-        return Result.ok(menuRes);
+        return Result.result(menuRes);
     }
 
     private List<UserMenuVO> createTreeMenus(Long pid, List<UserMenuVO> menus) {

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/RoleApiController.java

@@ -75,7 +75,7 @@ public class RoleApiController {
         if (!CollectionUtils.isEmpty(roles.getRecords())) {
             setRoleUserNname(roles.getRecords());
         }
-        return Result.ok(roles);
+        return Result.result(roles);
     }
 
     @ApiOperation("保存角色")
@@ -253,13 +253,13 @@ public class RoleApiController {
     @ApiOperation("根据角色查询菜单id")
     @PostMapping("/getRoleMenuId")
     public Result<?> getRoleMenuId(Long roleId) {
-        return Result.ok(roleService.getMenuIdsByRoleId(roleId,0));
+        return Result.result(roleService.getMenuIdsByRoleId(roleId,0));
     }
 
     @ApiOperation("根据角色查询菜单id")
     @PostMapping("/getH5RoleMenuId")
     public Result<?> getH5RoleMenuId(Long roleId) {
-        return Result.ok(roleService.getMenuIdsByRoleId(roleId,1));
+        return Result.result(roleService.getMenuIdsByRoleId(roleId,1));
     }
 
     /**
@@ -269,7 +269,7 @@ public class RoleApiController {
     @ApiOperation("根据角色查询组织id")
     @PostMapping("/getRoleDeptId")
     public Result<?> getRoleDeptId(Long roleId) {
-        return Result.ok(roleService.getdeptIdsByRoleId(roleId));
+        return Result.result(roleService.getdeptIdsByRoleId(roleId));
     }
 
     private void setRoleUserNname(List<RoleEntity> roles){

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/SubCompanyApiController.java

@@ -95,7 +95,7 @@ public class SubCompanyApiController {
     public Result save(CompanyDTO param) {
         IPage<SubCompanyEntity> page = new Page<>(param.getPageIndex(),param.getPageSize());
         IPage<SubCompanyEntity> companys = subCompanyService.page(page);
-        return Result.ok(companys);
+        return Result.result(companys);
     }
 
     @ApiOperation("删除子公司信息")

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/SubCompanyController.java

@@ -40,7 +40,7 @@ public class SubCompanyController {
         queryWrapper.eq("enabled", 1);
         queryWrapper.orderByAsc("sort");
         List<SubCompanyEntity> list = subCompanyService.list(queryWrapper);
-        return Result.ok(list);
+        return Result.result(list);
     }
 
     @GetMapping(value = "/subCompany/listHasAllCompany")
@@ -62,7 +62,7 @@ public class SubCompanyController {
         queryWrapper.orderByAsc("sort");
         List<SubCompanyEntity> subCompanyEntityList = subCompanyService.list(queryWrapper);
         list.addAll(subCompanyEntityList);
-        return Result.ok(list);
+        return Result.result(list);
     }
     @ApiOperation("启用禁用部门")
     @PostMapping("/su_company/enable")

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/SysAppApiController.java

@@ -54,7 +54,7 @@ public class SysAppApiController {
         if (one == null) {
             return Result.error("应用不存在或已删除");
         }
-        return Result.ok(one);
+        return Result.result(one);
     }
 
     @ApiOperation("保存或更新")

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/SysDictApiController.java

@@ -95,7 +95,7 @@ public class SysDictApiController {
         }
         queryWrapper.like(SysDictEntity::getIsDelete, Integer.valueOf(0));
         IPage<SysDictEntity> vos = sysDictService.page(page,queryWrapper);
-        return Result.ok(vos);
+        return Result.result(vos);
     }
 
     @PostMapping(value = "/listDetialByDictId")
@@ -113,7 +113,7 @@ public class SysDictApiController {
         queryWrapper.eq(SysDictDetailEntity::getIsDelete,Integer.valueOf(0));
 //      queryWrapper.eq(SysDictDetailEntity::getEnabled,1);
         IPage<SysDictDetailEntity> vos = sysDictDetailService.page(page,queryWrapper);
-        return Result.ok(vos);
+        return Result.result(vos);
     }
 
     @PostMapping(value = "/listDetialByCodes")

java/storlead-system/storlead-system-biz/src/main/java/com/storlead/system/mapper/MenuMapper.java

@@ -18,7 +18,7 @@ public interface MenuMapper extends BaseMapper<MenuEntity> {
 
     List<MenuEntity> queryByUsername(String userName);
 
-    MenuEntity selectRootLastNodeInfo(@Param("pid") Long pid);
+    MenuEntity selectRootLastNodeInfo(@Param("pid") Long pid, @Param("appId") Long appId);
 
     List<MenuEntity> selectUserMenuList(@Param("userId") Long userId,@Param("modeTypes") List modeTypes,@Param("menuTypes") List menuTypes);
 

java/storlead-system/storlead-system-biz/src/main/java/com/storlead/system/service/impl/AgentPromptTemplateServiceImpl.java

@@ -128,7 +128,7 @@ public class AgentPromptTemplateServiceImpl
             body.setSort(0);
         }
         saveOrUpdate(body);
-        return Result.ok(body.getId());
+        return Result.result(body.getId());
     }
 
     @Override
@@ -171,7 +171,7 @@ public class AgentPromptTemplateServiceImpl
         content = replaceIfPresent(content, "$liaisonName$", dto.getLiaisonName());
         content = replaceIfPresent(content, "$continent$", dto.getContinent());
         content = replaceIfPresent(content, "$country$", dto.getCountry());
-        return Result.ok(content);
+        return Result.result(content);
     }
 
     private LambdaQueryWrapper<AgentPromptTemplateEntity> buildListWrapper(