From 34de82b3794a413b438b66e0aa8bcdbe8133f7d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 四月 2025 10:16:48 +0800
Subject: [PATCH] 代码初始化
---
admin/src/components/business/OperaCategoryWindow.vue | 1 +
server/src/main/java/com/doumee/core/constants/Constants.java | 2 ++
server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 5 ++++-
server/src/main/java/com/doumee/api/web/WebMemberController.java | 2 --
admin/src/components/business/OperaCategoryDcaProblemWindow.vue | 3 ++-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/business/OperaCategoryDcaProblemWindow.vue b/admin/src/components/business/OperaCategoryDcaProblemWindow.vue
index b097f5c..e2002e3 100644
--- a/admin/src/components/business/OperaCategoryDcaProblemWindow.vue
+++ b/admin/src/components/business/OperaCategoryDcaProblemWindow.vue
@@ -29,7 +29,7 @@
</el-cascader>-->
</el-form-item>
<el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜锛堝崌搴忥級" v-trim/>
+ <el-input v-model="form.sortnum" type="number" placeholder="璇疯緭鍏ユ帓搴忕爜锛堝崌搴忥級" v-trim/>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ娉�" v-trim/>
@@ -142,6 +142,7 @@
if (target == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
+ this.form.parentId = parentId
this.form[this.configData['field.id']] = null
// this.form.categoryList = []
/*if (parentIdPath && parentIdPath != null) {
diff --git a/admin/src/components/business/OperaCategoryWindow.vue b/admin/src/components/business/OperaCategoryWindow.vue
index 6abc7b5..e3f47e0 100644
--- a/admin/src/components/business/OperaCategoryWindow.vue
+++ b/admin/src/components/business/OperaCategoryWindow.vue
@@ -130,6 +130,7 @@
if (target == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
+ this.form.parentId = parentId
this.form[this.configData['field.id']] = null
this.form.categoryList = []
/* if (parentIdPath && parentIdPath != null) {
diff --git a/server/src/main/java/com/doumee/api/web/WebMemberController.java b/server/src/main/java/com/doumee/api/web/WebMemberController.java
index 3c6571e..6121e43 100644
--- a/server/src/main/java/com/doumee/api/web/WebMemberController.java
+++ b/server/src/main/java/com/doumee/api/web/WebMemberController.java
@@ -41,12 +41,10 @@
public class WebMemberController {
@Resource
private JwtTokenUtil jwtTokenUtil;
-
@Resource
private MemberService memberService;
@Resource
private SystemDictDataBiz systemDictDataBiz;
-
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("H5涓氬姟鐧诲綍")
diff --git a/server/src/main/java/com/doumee/core/constants/Constants.java b/server/src/main/java/com/doumee/core/constants/Constants.java
index 614f28e..f8f1ea0 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -31,6 +31,8 @@
public static final Integer TWO = 2;
public static final Integer ZERO = 0;
public static final Integer THREE = 3;
+ public static final Integer FOUR = 4;
+ public static final Integer SIX = 6;
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
diff --git a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 80c984b..2221ec1 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -70,7 +70,10 @@
if(parent == null || Constants.equalsInteger(parent.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇淇℃伅涓嶅瓨鍦▇");
}
-
+ if(Constants.equalsInteger(parent.getType(),Constants.FOUR) && parent.getParentId()!=null){
+ //濡傛灉鏄簩绾DA涓婚,鑷繁涓鸿瀵熼」
+ category.setType(Constants.SIX);
+ }
idPath = parent.getIdPath();
category.setIdPath(parent.getIdPath()+category.getId()+"/");
category.setNamePath(parent.getNamePath()+"/"+category.getName());
--
Gitblit v1.9.3