From a7a57c08a3c632bfc7fc82b8015167022c2d8505 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 14 九月 2023 18:23:37 +0800
Subject: [PATCH] #自测修改
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 1 +
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 30 ++++++++++++++++++++++++++++++
server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java | 11 +++--------
3 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
index dd474e5..51522dd 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -48,15 +48,10 @@
}
@ApiOperation("鏌ヨ鍒楄〃鏍�")
- @PostMapping("/treeList/{type}")
+ @PostMapping("/treeList")
@RequiresPermissions("system:menu:query")
-<<<<<<< HEAD
- public ApiResponse<List<SystemMenuListVO>> findTree ( @RequestBody SystemMenu systemMenu ) {
- return ApiResponse.success(systemMenuBiz.findTree());
-=======
- public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
- return ApiResponse.success(systemMenuBiz.findTreeByType(type));
->>>>>>> a7e6a3b52c64ba9add0ceb643d6915473a7770a4
+ public ApiResponse<List<SystemMenuListVO>> findTree () {
+ return ApiResponse.success(systemMenuBiz.findTreeByType(0));
}
@PreventRepeat
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index f4af074..93c5fb8 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -38,6 +38,7 @@
public static final String CATEGORY_IMG = "CATEGORY_IMG";
public static final String GOODS_IMG ="GOODS_IMG" ;
public static final String GOODS_PRICE_RATE = "GOODS_PRICE_RATE";
+ public static final String COMPANY_MANAGE_ROLE = "COMPANY_MANAGE_ROLE";
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index b8e28e8..7dfd956 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.biz.system.SystemDictBiz;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -16,9 +18,15 @@
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.dto.CompanyCreatOrUpdateRequest;
+import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.SystemUserRoleMapper;
+import com.doumee.dao.system.model.SystemDict;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.model.SystemUserRole;
import com.doumee.service.business.CompanyService;
+import com.doumee.service.system.SystemDictService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -47,6 +55,14 @@
@Autowired
private SystemUserMapper systemUserMapper;
+
+
+ @Autowired
+ private SystemUserRoleMapper systemUserRoleMapper;
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
@@ -87,6 +103,20 @@
.eq(SystemUser::getId,company.getManagerId())
.set(SystemUser::getCompanyId,insert.getId());
systemUserMapper.update(null,systemUserQuery);
+
+
+ SystemDictData dictData = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.COMPANY_MANAGE_ROLE);
+
+ SystemUserRole systemUserRole = new SystemUserRole();
+ systemUserRole.setUserId(company.getManagerId());
+ systemUserRole.setRoleId(Integer.valueOf(dictData.getCode()));
+ systemUserRole.setCreateTime(new Date());
+ systemUserRole.setUpdateTime(new Date());
+ systemUserRole.setCreateUser(userInfo.getId());
+ systemUserRole.setUpdateUser(userInfo.getId());
+ systemUserRole.setDeleted(Boolean.FALSE);
+
+ systemUserRoleMapper.insert(systemUserRole);
return company.getId();
}
--
Gitblit v1.9.3