rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '惠信/develop' into develop

This commit is contained in:
曹鹏飞 2025-03-09 17:27:52 +08:00
parent 43f87574d4 89fb131a79
commit 8d93dbc7c9
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java
View File

@ -146,7 +146,7 @@ public class CustomerController extends ControllerBase {
VUtils.trueThrow(CollUtil.isEmpty(ids)).throwMessage(STATE.ParamErr,"请选择要删除的行");
//
List<AppUser> appUserUsed = appUserService.lambdaQuery().in(AppUser::getCompanyId, ids).list();
List<AppUser> appUserUsed = appUserService.lambdaQuery().eq(AppUser::getIsDel,0).in(AppUser::getCompanyId, ids).list();
if(CollUtil.isNotEmpty(appUserUsed)){
Set<String> userCompanyIds = appUserUsed.stream().map(u -> u.getCompanyId()).collect(Collectors.toSet());
List<TBaseCustomer> checkResult = baseCustomerService.lambdaQuery().in(TBaseCustomer::getId, userCompanyIds).list();

14
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java
View File

@ -17,8 +17,10 @@ import com.nflg.mobilebroken.common.pojo.vo.CqmPersionResultVO;
import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.AdminUser;
import com.nflg.mobilebroken.repository.entity.ParamConfig;
import com.nflg.mobilebroken.repository.entity.TBaseDeviceType;
import com.nflg.mobilebroken.repository.service.IAdminUserService;
import com.nflg.mobilebroken.repository.service.IParamConfigService;
import com.nflg.mobilebroken.repository.service.ITBaseDeviceTypeService;
import com.nflg.mobilebroken.starter.annotation.MethodInfoMark;
@ -45,6 +47,11 @@ public class DeviceTypeController extends ControllerBase {
@Resource
IParamConfigService paramConfigService;
@Resource
IAdminUserService adminUserService;
/**
* 获取设备类型列表
* @param query
@ -54,6 +61,13 @@ public class DeviceTypeController extends ControllerBase {
@ApiMark(moduleName = "设备类型管理", apiName = "获取设备类型列表")
public ApiResult<PageData<TBaseDeviceTypeVO>> getList(@RequestBody DeviceTypeQuery query){
Page<TBaseDeviceType> result = baseDeviceTypeService.getList(new Page<>(query.getPage(),query.getPageSize()), query);
result.getRecords().forEach(u->{
if(StrUtil.isNotBlank(u.getCqmPersonId())){
List<AdminUser> adminUsers = adminUserService.lambdaQuery().eq(AdminUser::getIsDel, 0).in(AdminUser::getId, StrUtil.split(u.getCqmPersonId(), ",")).list();
u.setCqmPersonId(StrUtil.join(",", adminUsers.stream().map(u1->u1.getUserName()).collect(Collectors.toList())));
u.setCqmPersonName(StrUtil.join(",", adminUsers.stream().map(u1->u1.getUserName()).collect(Collectors.toList())));
}
});
return ApiResult.success(Convert.toList(TBaseDeviceTypeVO.class,result.getRecords()) ,query,result.getTotal());
}

2
nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml
View File

@ -41,7 +41,7 @@
<select id="getDeviceTypeCqmList" resultType="com.nflg.mobilebroken.common.pojo.vo.CqmPersionResultVO">
select a.id,a.user_code, a.user_name,a.department_id,b.dept_code,b.dept_name from admin_user a
join t_base_department b on a.department_id=b.id
where a.id in
where a.is_del=0 and a.id in
<foreach collection="ids" item="item" open="(" close=")" separator=",">
#{item}
</foreach>