diff --git a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java index f07a4d84..cfaed984 100644 --- a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java +++ b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java @@ -25,7 +25,7 @@ import java.util.List; @AllArgsConstructor public enum TeamObjectTypeEnum implements SkyeyeEnumClass { - CUSTOMER(1, "客户团队", Arrays.asList("contactsAuthEnum", "crmContractAuthEnum"), true, true), + CUSTOMER(1, "客户团队", Arrays.asList("contactsAuthEnum", "crmContractAuthEnum", "crmOpportunityAuthEnum"), true, true), SUPPLIER(2, "供应商团队", Arrays.asList("contactsAuthEnum"), true, false), PROJECT(3, "项目团队", Arrays.asList(), true, false); diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/clazz/rest/DsFormPageContentService.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/clazz/rest/DsFormPageContentService.java deleted file mode 100644 index 8e5ae238..00000000 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/clazz/rest/DsFormPageContentService.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.clazz.rest; - -import com.skyeye.common.client.ClientConfiguration; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * @ClassName: DsFormPageContentService - * @Description: 动态表单页面关联组件管理服务接口 - * @author: skyeye云系列--卫志强 - * @date: 2022/9/18 16:08 - * @Copyright: 2022 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -@FeignClient(value = "${webroot.skyeye-flowable}", configuration = ClientConfiguration.class) -public interface DsFormPageContentService { - - /** - * 查看某个动态表单中的表单控件 - * - * @param pageId - * @return - */ - @GetMapping("/dsformpage004") - String queryFormPageContentByPageId(@RequestParam("pageId") String pageId); - -} diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/clazz/rest/DsFormPageService.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/clazz/rest/DsFormPageService.java deleted file mode 100644 index 8b50b7bd..00000000 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/clazz/rest/DsFormPageService.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.clazz.rest; - -import com.skyeye.common.client.ClientConfiguration; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * @ClassName: DsFormPageService - * @Description: 动态表单页面管理服务接口 - * @author: skyeye云系列--卫志强 - * @date: 2022/9/18 16:08 - * @Copyright: 2022 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -@FeignClient(value = "${webroot.skyeye-flowable}", configuration = ClientConfiguration.class) -public interface DsFormPageService { - - /** - * 通过id查找对应的动态表单页面 - * - * @param id - * @return - */ - @GetMapping("/dsformpage006") - String queryDsFormPageById(@RequestParam("id") String id); - -} diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java index a1f9bbaf..78662352 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java @@ -93,4 +93,12 @@ public class DsFormPage extends OperatorUserInfo { @ApiModelProperty(value = "页面关联的操作信息,可为空", required = "json") private List operateIdList; + @TableField("is_data_auth") + @ApiModelProperty(value = "表格时拥有,是否开启数据权限,参考#WhetherEnum") + private Integer isDataAuth; + + @TableField("data_auth_point_num") + @ApiModelProperty(value = "开启数据权限后,需要填写权限点编号(列表接口的权限点编号)") + private String dataAuthPointNum; + } diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/service/impl/DsFormPageServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/service/impl/DsFormPageServiceImpl.java index 655191ae..d4d8572d 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/service/impl/DsFormPageServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/service/impl/DsFormPageServiceImpl.java @@ -120,8 +120,10 @@ public class DsFormPageServiceImpl extends SkyeyeBusinessServiceImpl