From 51527a6e817a6ba73b29b07e94a7e879a86f8eaf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 06 三月 2024 16:29:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java
index 7f8c6d6..9624bd0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java
@@ -1,12 +1,15 @@
package com.ruoyi.system.controller.conslole;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.domain.pojo.staff.SysStaff;
+import com.ruoyi.system.api.domain.dto.MerEditUserDto;
+import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.service.staff.SysStaffService;
+import com.ruoyi.system.service.staff.SysWxCpService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -21,8 +24,17 @@
@Resource
private SysStaffService sysStaffService;
- @RequestMapping(value = "/isLeader", method = RequestMethod.POST)
- @ApiOperation(value = "获取员工信息")
+ @Resource
+ private SysWxCpService sysWxCpService;
+
+ /**
+ * @description 判断员工是否领导
+ * @author jqs
+ * @date 2023/7/19 19:45
+ * @param
+ * @return Boolean
+ */
+ @PostMapping("/isLeader")
public Boolean isLeader() {
Long userId = SecurityUtils.getUserId();
SysStaff sysStaff = sysStaffService.getByUserId(userId);
@@ -31,4 +43,18 @@
}
return false;
}
+
+ /**
+ * @description 编辑商户员工
+ * @author jqs
+ * @date 2023/7/19 19:44
+ * @param merEditUserDto
+ * @return R
+ */
+ @PostMapping("/editSysStaffInfo")
+ public R editUserInfo(@RequestBody MerEditUserDto merEditUserDto){
+ sysStaffService.editSysStaffInfo(merEditUserDto);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1