|
@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.tools.constant.Constant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.Constant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.constant.NumConstant; |
|
|
import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; |
|
|
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; |
|
@ -32,10 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.commons.tools.utils.TreeUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.TreeUtils; |
|
|
import com.elink.esua.epdc.dao.ModuleTypeDao; |
|
|
import com.elink.esua.epdc.dao.ModuleTypeDao; |
|
|
import com.elink.esua.epdc.dao.NoticeDao; |
|
|
import com.elink.esua.epdc.dao.NoticeDao; |
|
|
import com.elink.esua.epdc.dto.ModuleOption; |
|
|
import com.elink.esua.epdc.dto.*; |
|
|
import com.elink.esua.epdc.dto.ModuleOptionDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.ModuleTypeCategoryDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.ModuleTypeDTO; |
|
|
|
|
|
import com.elink.esua.epdc.entity.ModuleTypeEntity; |
|
|
import com.elink.esua.epdc.entity.ModuleTypeEntity; |
|
|
import com.elink.esua.epdc.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.redis.ModuleTypeRedis; |
|
|
import com.elink.esua.epdc.redis.ModuleTypeRedis; |
|
@ -338,6 +336,15 @@ public class ModuleTypeServiceImpl extends BaseServiceImpl<ModuleTypeDao, Module |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public Result getModuleList(ModuleListFormDTO dto) { |
|
|
|
|
|
int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); |
|
|
|
|
|
dto.setPageIndex(pageIndex); |
|
|
|
|
|
List<AppModuleListDTO> result = baseDao.getModuleList(dto); |
|
|
|
|
|
return new Result().ok(result); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<ModuleOptionDTO> getOtherDept(List<ModuleOptionDTO> deptList, JSONArray parent) { |
|
|
List<ModuleOptionDTO> getOtherDept(List<ModuleOptionDTO> deptList, JSONArray parent) { |
|
|
List<Long> already = Lists.newArrayList(); |
|
|
List<Long> already = Lists.newArrayList(); |
|
|
for (int i = 0; i < parent.size(); i++) { |
|
|
for (int i = 0; i < parent.size(); i++) { |
|
|