预打包,翻页Bug修改

This commit is contained in:
liuzhaotian
2024-08-07 16:30:41 +08:00
parent 42a5b9c6ab
commit 5126fd03d1
8 changed files with 51 additions and 40 deletions
@@ -1,6 +1,7 @@
package com.cf.imes.module.system.api.setting;
import com.cf.imes.framework.common.enums.UserSettingTypeEnum;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.security.core.LoginUser;
import com.cf.imes.module.system.api.setting.dto.PackageConfigDTO;
@@ -11,7 +12,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.CURRENTLY_NO_CONFIGURATION_AVAILABLE;
@RestController // 提供 RESTful API 接口,给 Feign 调用
@Validated
@@ -26,8 +29,13 @@ public class SettingApiImpl implements SettingApi{
public PackageConfigDTO getUserSetting(Integer type) {
LoginUser loginUser = getLoginUser();
assert loginUser != null;
PackageConfigDO packageConfigDO = settingMapper.selectSetting(type, loginUser.getId(), loginUser.getOrganId());
if(packageConfigDO == null){
throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE,type == 1 ? UserSettingTypeEnum.PREPACKAGED.getName(): UserSettingTypeEnum.PACKAGED.getName());
}
return BeanUtils.toBean(packageConfigDO,PackageConfigDTO.class);
}