fix：删除无效代码

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -261,13 +261,11 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         }
         //先处理修改的
         editList.forEach(syncSingleDealDTO -> {
-            // TODO: 2020/4/9  需要优化
             TabHaobanDepartment department = departmentService.selectById(syncSingleDealDTO.getDepartmentId());
             if (!department.getParentDepartmentId().equals(syncSingleDealDTO.getParentDepartmentId())) {
                 department.setParentDepartmentId(syncSingleDealDTO.getParentDepartmentId());
-                departmentApiService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, department));
+                departmentService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, department));
             }
-
         });
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -281,44 +281,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 
     @Override
     public void del(String staffDepartmentStaffRelatedId) {
-        StaffDepartmentRelatedDTO related = staffDepartmentRelatedService.getById(staffDepartmentStaffRelatedId);
-        if (related != null) {
-            List<TabHaobanStaffDepartmentRelated> relatedList = staffDepartmentRelatedService.listStaffDepartmentByStaffId(related.getStaffId());
-            if (relatedList == null || relatedList.isEmpty()) {
-                return;
-            }
-            //只在当前门店
-            if (relatedList.size() == 1) {
-                TabHaobanStaff staff = staffService.selectById(relatedList.get(0).getStaffId());
-                WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(staff.getWxEnterpriseId());
-                if (enterpriseDTO != null) {
-                    ServiceResponse delQywxStaff = delQywxStaff(staff, enterpriseDTO);
-                    logger.info("【删除成员】{} ,jp={}", staffDepartmentStaffRelatedId, JSON.toJSONString(delQywxStaff));
-                    if (delQywxStaff.getCode() != 1) {
-                        throw new RuntimeException("企业微信删除失败");
-                    }
-                }
-                staffDepartmentRelatedService.del(related);
 
-                TabHaobanStaffDepartmentRelated staffRelated = relatedList.get(0);
-                if (StringUtils.isNotBlank(staffRelated.getClerkCode())) {
-                    cleanGicClerk(staffRelated.getClerkCode(), related.getDepartmentId());
-                }
-                //走修改流程
-            } else {
-                String departmentIds = "";
-                for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : relatedList) {
-                    if (!staffDepartmentStaffRelatedId.equals(tabHaobanStaffDepartmentRelated.getStaffDepartmentRelatedId())) {
-                        departmentIds += tabHaobanStaffDepartmentRelated.getDepartmentId() + ",";
-                    }
-                }
-                if (StringUtils.isNotBlank(departmentIds)) {
-                    departmentIds = departmentIds.substring(0, departmentIds.length() - 1);
-                }
-                TabHaobanStaff staff = staffService.selectById(relatedList.get(0).getStaffId());
-                staffEdit(EntityUtil.changeEntityByJSON(StaffDTO.class, staff), departmentIds);
-            }
-        }
     }
 
     @Override
@@ -1139,46 +1102,6 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
     }
 
-    /**
-     * 删除企业微信
-     *
-     * @param staff
-     * @return
-     */
-    private ServiceResponse delQywxStaff(TabHaobanStaff staff, WxEnterpriseDTO enterpriseDTO) {
-        ServiceResponse ret = new ServiceResponse();
-        DepartmentDTO tempFlagDepartment = departmentService.getTempFlagDepartment(enterpriseDTO.getWxEnterpriseId());
-        if (null == tempFlagDepartment) {
-            DepartmentDTO parentDepert = departmentService.getRootByEnterpriseId(enterpriseDTO.getWxEnterpriseId());
-            tempFlagDepartment = new DepartmentDTO();
-            tempFlagDepartment.setTempFlag(1);
-            tempFlagDepartment.setDepartmentName("暂存部门");
-            tempFlagDepartment.setWxEnterpriseId(enterpriseDTO.getWxEnterpriseId());
-            tempFlagDepartment.setHasSonNode(false);
-            tempFlagDepartment.setIsStore(0);
-            tempFlagDepartment.setParentDepartmentId(parentDepert.getDepartmentId());
-            ServiceResponse<DepartmentDTO> response = departmentApiService.add(tempFlagDepartment);
-            if (response.getCode() != 1) {
-                ret.setCode(0);
-                ret.setMessage("暂存部门创建失败");
-                return ret;
-            }
-            tempFlagDepartment = response.getResult();
-        }
-        try {
-            staffEdit(EntityUtil.changeEntityByJSON(StaffDTO.class, staff), tempFlagDepartment.getDepartmentId());
-        } catch (RuntimeException ex) {
-            ret.setCode(0);
-            ret.setMessage(ex.getMessage());
-        } catch (Exception e) {
-            ret.setCode(0);
-            ret.setMessage("新增异常");
-        } finally {
-            return ret;
-        }
-
-    }
-
     @Override
     public ServiceResponse<String> getStaffQrcode(String clerkCode, String storeId) {
         ServiceResponse<String> resp = new ServiceResponse<>();