Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2023-12-05 16:40:16 +08:00
parent a5fe1ddf58 62dec90c52
commit 6bb0fbad75
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java
View File

@@ -208,11 +208,9 @@ public class AreaController extends BaseController {
public HttpResult<List<AreaTreeDTO>> areaDeptTree(@RequestParam(required = false) @ApiParam("id") String id, @RequestParam("type") Integer type) {
String methodDescribe = getMethodDescribe("areaDeptTree");
List<AreaTreeDTO> result = areaService.areaDeptTree(id, type);
if (!result.isEmpty()) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**

2
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
View File

@@ -309,7 +309,7 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
@Override
public Page<AuditLogCusVO> censusAuditLog(AuditParam auditParam) {
auditParam.setSearchBeginTime(DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())).toString());
auditParam.setSearchEndTime(DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchBeginTime())).toString());
auditParam.setSearchEndTime(DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime())).toString());
//待分页数据总量
Page<AuditLogCusVO> page = auditMapper.selectCensusAuditLog(new Page<>(auditParam.getPageNum(), auditParam.getPageSize()), auditParam);
return page;

11
pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
View File

@@ -11,7 +11,6 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.system.pojo.dto.AreaTreeDTO;
import com.njcn.system.pojo.po.Area;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.user.pojo.param.DeptParam;
import com.njcn.user.pojo.po.Dept;
@@ -20,13 +19,12 @@ import com.njcn.user.pojo.vo.DeptTreeVO;
import com.njcn.user.pojo.vo.DeptVO;
import com.njcn.user.pojo.vo.PvTerminalTreeVO;
import com.njcn.user.service.IDeptService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@@ -74,11 +72,8 @@ public class DeptController extends BaseController {
public HttpResult<Object> getAreaTree(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) {
String methodDescribe = getMethodDescribe("getAreaTree");
List<AreaTreeDTO> result = deptService.getAreaTree(id,type);
if (!result.isEmpty()) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**

3
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
View File

@@ -196,6 +196,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
List<String> areaTreeVO = deptArea();
HttpResult<List<AreaTreeDTO>> areaTreeDTOS = areaFeignClient.areaDeptTree(id, type);
List<AreaTreeDTO> list = areaTreeDTOS.getData();
if(CollectionUtils.isEmpty(list)){
return new ArrayList<>();
}
for (AreaTreeDTO areaTreeVOList : list) {
if (areaTreeVO.contains(areaTreeVOList.getId())) {
areaTreeVOList.setName(areaTreeVOList.getName() + "(已被绑定)");