From 13a2899e1d38fa93174e96b5f92be1b907bfe3c8 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 20 Aug 2024 17:53:00 +0800
Subject: [PATCH] 8/20

---
 .../com/yxt/portal/apiadmin/DictCommonRest.java     |  3 ++-
 .../java/com/yxt/portal/apiadmin/DictTypeRest.java  |  1 +
 .../com/yxt/portal/apiadmin/SysStaffinfoRest.java   | 13 +++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java b/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java
index 014a5a3..b678958 100644
--- a/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java
@@ -95,7 +95,7 @@ public class DictCommonRest {
                     return resultBean.setMsg(dictType + "此类型的数据项已存在");
                 }
             }
-            if (0 == dictCommonService.updateBySid(dictCommonDto.toMap(), sid)) {
+            if (0 == dictCommonService.updateBySid(dictCommonDto, sid)) {
                 return resultBean.setMsg("更新失败");
             }
         } else {
@@ -112,6 +112,7 @@ public class DictCommonRest {
         if (null == dictCommon) {
             return ResultBean.fireFail().setMsg("该数据项不存在");
         }
+        dictCommon.setIsDelete(1);
         dictCommonService.update(dictCommon,new QueryWrapper<DictCommon>().eq("sid",sid));
 //        if (0 == ) {
 //            return ResultBean.fireFail().setMsg("删除失败");
diff --git a/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java
index 9015e55..fd87b25 100644
--- a/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java
@@ -98,6 +98,7 @@ public class DictTypeRest{
         if (dictCommon.size() > 0) {
             return ResultBean.fireFail().setMsg("该数据字典类型下存在数据项，请先删除该类下的数据项");
         }
+        dictType.setIsDelete(1);
         dictTypeService.update(dictType,new QueryWrapper<DictType>().eq("sid",sid));
         return ResultBean.fireSuccess().setMsg("删除成功");
     }
diff --git a/src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java b/src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java
index da68276..30d5c69 100644
--- a/src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java
@@ -1,9 +1,11 @@
 package com.yxt.portal.apiadmin;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.portal.biz.sysstaffinfo.*;
 import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffQuery;
 import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffVo;
+import com.yxt.portal.biz.sysuser.SysUser;
 import com.yxt.portal.biz.sysuser.SysUserService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.PagerUtil;
@@ -139,6 +141,17 @@ public class SysStaffinfoRest{
         }
         return rb.success().setData(sysStaffinfo);
     }
+    @ApiOperation("员工信息编辑初始化及详情")
+    @GetMapping("/fetchBySidP")
+    public ResultBean<SysStaffinfo> fetchBySidP(@RequestParam("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysUser sysUser=sysUserService.fetchBySid(sid);
+        SysStaffinfo sysStaffinfo = sysStaffinfoService.getOne(new QueryWrapper<SysStaffinfo>().eq("sid",sysUser.getStaffSid()));
+        if (sysStaffinfo == null) {
+            return rb.setData(new SysStaffinfo());
+        }
+        return rb.success().setData(sysStaffinfo);
+    }
     /**
      * 获取集团内全部员工姓名
      *