diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java index 60122d1..f62c589 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java @@ -99,7 +99,6 @@ public class OrgEOController extends BaseController { LocalDateTime dateTime = LocalDateTime.now(); String currentDateTimeString = dateTime.format(formatter); orgEO.setUpdateTime(currentDateTimeString); -// orgEO.setStatus(1); return orgEOService.saveOrUpdateSingleton(orgEO); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java index ca10960..a103eff 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java @@ -14,10 +14,6 @@ public class OrgEOPage extends BasePage { */ private String DepartmentCode; - /** - * 唯一值 - */ - private String UUID; /** * 部门名称 @@ -27,17 +23,17 @@ public class OrgEOPage extends BasePage { /** * 部门级别 */ - private Integer orgLevel; + private String LeveL; /** * 父部门编码 */ - private String supOrgCode; + private String ParentID; /** * 部门简称 */ - private String orgShortName; + private String ShortName; /** * 归属地 diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java index fdaee37..7b7a79b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java @@ -16,7 +16,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; +import java.util.UUID; @Service("orgEOService") @Transactional @@ -32,18 +34,10 @@ public class OrgEOService extends ServiceImpl implements IOrgEo } public void delete(String ids) { - // TODO 没有状态字段了,直接删了把 -// String[] idArray = ids.split(","); -// OrgEO orgEO = new OrgEO(); -// orgEO.setStatus(-1); -// QueryWrapper orgEOQueryWrapper = new QueryWrapper<>(); -// orgEOQueryWrapper.in("org_code",idArray); -// baseMapper.update(orgEO,orgEOQueryWrapper); + baseMapper.deleteBatchIds(Arrays.asList(ids.split(","))); } public List selectList(OrgEO orgEO) { - // TODO 无状态字段了 -// orgEO.setStatus(1); List orgEOList = baseMapper.selectListByVO(orgEO); return orgEOList; } @@ -68,10 +62,9 @@ public class OrgEOService extends ServiceImpl implements IOrgEo return Result.error("部门编码重复"); } if(StringUtils.isBlank(orgEO.getId())){ - orgEO.setId(orgEO.getDepartmentCode()); + orgEO.setId(UUID.randomUUID().toString()); baseMapper.insert(orgEO); }else{ - orgEO.setId(orgEO.getDepartmentCode()); baseMapper.updateById(orgEO); } return Result.success();