解决客户端删除人员后小程序仍能登录的bug

xueyi-api/xueyi-api-tenant/src/main/java/com/xueyi/tenant/api/tenant/domain/po/SysEnterpriseStaffPo.java

@@ -27,4 +27,13 @@ public class SysEnterpriseStaffPo extends TBaseEntity {
     private Long tId;//租户号
 
     private String openid;
+
+    public SysEnterpriseStaffPo (){
+        super();
+    }
+    public SysEnterpriseStaffPo (Long id){
+        super();
+        this.id = id;
+    }
+
 }

xueyi-api/xueyi-api-tenant/src/main/java/com/xueyi/tenant/api/tenant/feign/RemoteTenantService.java

@@ -59,4 +59,7 @@ public interface RemoteTenantService {
     @PostMapping("/tenant/save-staff")
     R<SysEnterpriseStaffPo> saveEnterpriseStaff(@RequestBody SysEnterpriseStaffPo staff, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @PostMapping("/tenant/del-staff")
+    R<SysEnterpriseStaffPo> delEnterpriseStaff(@RequestBody SysEnterpriseStaffPo staff, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
 }

xueyi-api/xueyi-api-tenant/src/main/java/com/xueyi/tenant/api/tenant/feign/factory/RemoteTenantFallbackFactory.java

@@ -69,6 +69,11 @@ public class RemoteTenantFallbackFactory implements FallbackFactory<RemoteTenant
             public R<SysEnterpriseStaffPo> saveEnterpriseStaff(SysEnterpriseStaffPo staff, String source) {
                 return R.fail("保存员工失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<SysEnterpriseStaffPo> delEnterpriseStaff(SysEnterpriseStaffPo staff, String source) {
+                return R.fail("删除员工失败:" + throwable.getMessage());
+            }
         };
     }
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/resource/service/impl/DmResourcesServiceImpl.java

@@ -66,9 +66,10 @@ public class DmResourcesServiceImpl extends BaseServiceImpl<DmResourcesQuery, Dm
         DmResourcesDto dmResourcesDto = new DmResourcesDto();
         if (StringUtils.isNotEmpty(base64Img)) {
             String imgBase64 = base64Img;
-            R<SysFile> fileResult = fileService.uploadFace(imageUtil.convertToMultipartFile(imgBase64));
-            if (ObjectUtil.isNull(fileResult) || ObjectUtil.isNull(fileResult.getData()))
+            R<SysFile> fileResult = fileService.uploadFace(ImageUtil.convertToMultipartFile(imgBase64));
+            if (ObjectUtil.isNull(fileResult) || ObjectUtil.isNull(fileResult.getData())){
                 return R.fail(fileResult.getMsg());
+            }
             String url = fileResult.getData().getUrl();
 
             dmResourcesDto.setType(DmResourcesDto.TYPE_PIC);

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/impl/DmStaffServiceImpl.java

@@ -3,6 +3,7 @@ package com.xueyi.system.staff.service.impl;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.xueyi.common.cache.utils.SourceUtil;
@@ -43,8 +44,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -97,8 +100,7 @@ public class DmStaffServiceImpl extends BaseServiceImpl<DmStaffQuery, DmStaffDto
     @Override
     @TenantIgnore(tenantLine = true)
     public List<DmStaffPo> selectStaffList(DmStaffPo staff) {
-        List<DmStaffPo> result = staffMapper.selectStaffList(staff);
-        return result;
+        return staffMapper.selectStaffList(staff);
     }
 
     @Override
@@ -319,7 +321,6 @@ public class DmStaffServiceImpl extends BaseServiceImpl<DmStaffQuery, DmStaffDto
             birthJson.put("timestamp",dmStaff.getBirthDate().getTime());
             vo.setTemplate("birthday");
             vo.setFormat(birthJson);
-            System.out.println(birthJson.toJSONString());
             remoteIntentService.sendMessage(vo,tenantId,source.getMaster(), SecurityConstants.INNER);
         }
         if (dmStaff.getHireDate() != null) {
@@ -331,20 +332,19 @@ public class DmStaffServiceImpl extends BaseServiceImpl<DmStaffQuery, DmStaffDto
             hireJson.put("timestamp",dmStaff.getHireDate().getTime());
             vo2.setTemplate("hireDate");
             vo2.setFormat(hireJson);
-            System.out.println(hireJson.toJSONString());
             remoteIntentService.sendMessage(vo2,tenantId,source.getMaster(), SecurityConstants.INNER);
         }
         return super.insert(dmStaff);
     }
 
 
+    @Override
     public int update(DmStaffDto dmStaff) {
         Long tenantId = SecurityContextHolder.getEnterpriseId();
         SysEnterpriseDto enterpriseDto = enterpriseService.selectById(tenantId);
         Source source = SourceUtil.getSourceCache(enterpriseDto.getStrategyId());
-        SysEnterpriseStaffPo enterpriseStaff = new SysEnterpriseStaffPo();
+        SysEnterpriseStaffPo enterpriseStaff = new SysEnterpriseStaffPo(dmStaff.getId());
         enterpriseStaff.setPhone(dmStaff.getPhone());
-        enterpriseStaff.setId(dmStaff.getId());
         enterpriseStaff.setTId(SecurityContextHolder.getEnterpriseId());
         tenantService.saveEnterpriseStaff(enterpriseStaff, SecurityConstants.INNER);
 
@@ -369,10 +369,27 @@ public class DmStaffServiceImpl extends BaseServiceImpl<DmStaffQuery, DmStaffDto
             hireJson.put("timestamp",dmStaff.getHireDate().getTime());
             vo2.setTemplate("hireDate");
             vo2.setFormat(hireJson);
-            System.out.println(hireJson.toJSONString());
             remoteIntentService.sendMessage(vo2,tenantId,source.getMaster(), SecurityConstants.INNER);
         }
 
         return super.update(dmStaff);
     }
+
+    @Override
+    @DSTransactional
+    public int deleteByIds(Collection<? extends Serializable> idList) {
+        for (Serializable id : idList) {
+            SysEnterpriseStaffPo enterpriseStaff = new SysEnterpriseStaffPo((Long) id);
+            tenantService.delEnterpriseStaff(enterpriseStaff, SecurityConstants.INNER);
+        }
+        return super.deleteByIds(idList);
+    }
+
+    @Override
+    @DSTransactional
+    public int deleteById(Serializable id) {
+        SysEnterpriseStaffPo enterpriseStaff = new SysEnterpriseStaffPo((Long) id);
+        tenantService.delEnterpriseStaff(enterpriseStaff, SecurityConstants.INNER);
+        return super.deleteById(id);
+    }
 }

xueyi-modules/xueyi-tenant/src/main/java/com/xueyi/tenant/tenant/controller/TeTenantController.java

@@ -148,6 +148,20 @@ public class TeTenantController extends BaseController<TeTenantQuery, TeTenantDt
 
         return R.ok(staff);
     }
+
+    @InnerAuth
+    @PostMapping("/del-staff")
+    @TenantIgnore(tenantLine = true)
+    R<SysEnterpriseStaffPo> delStaff(@RequestBody SysEnterpriseStaffPo staff) {
+        if (staff.getId() != null) {
+            SysEnterpriseStaffPo staffPo = staffMapper.selectById(staff.getId());
+            if (null != staffPo) {
+                staffMapper.deleteById(staff.getId());
+            }
+        }
+
+        return R.ok(staff);
+    }
     /**
      * 查询租户列表
      */