diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java index 5ccb75a..eddc178 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java @@ -35,7 +35,6 @@ import com.chinaweal.aiccs.common.constant.FlowConstant; import com.chinaweal.aiccs.common.util.DateUtils; import com.chinaweal.aiccs.common.util.StringUtils; import com.chinaweal.aiccs.common.util.WorkNoUtil; -import com.chinaweal.aiccs.org.entity.OrgUnits; import com.chinaweal.aiccs.org.service.AicorgService; import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.aicorg.pojo.AICPermission; @@ -113,19 +112,19 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl baseinfoListByRegOrg(BaseQuery query, AICUser user) { ForceDeregisterSpeQueryDto entity = query.getEntity(ForceDeregisterSpeQueryDto.class); - + // 获取用户地区ID并设置为9位 String regionID = user.getRegionID(); - if(regionID.length() == 6){ + if (regionID.length() == 6) { regionID = regionID + "000"; } entity.setRegOrg(regionID); Page page = new Page<>(query.getCurrent(), query.getSize()); - + // 调用手写 SQL 查询 IPage eBaseinfoIPage = baseMapper.baseinfoListByRegOrg(page, entity); - + // 处理 EnterType 赋值逻辑 // for (EBaseinfo eBaseinfo : eBaseinfoIPage.getRecords()) { // String entType = eBaseinfo.getEnttype(); @@ -321,6 +320,8 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl forceDeregisterPageByRegOrg(BaseQuery query, AICUser user) { ForceDeregisterSpeQueryDto entity = query.getEntity(ForceDeregisterSpeQueryDto.class); String userRegOrg = user.getRegionID(); - if(userRegOrg.length() == 6){ + if (userRegOrg.length() == 6) { userRegOrg = userRegOrg + "000"; //取9位去查 } @@ -732,7 +762,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl