添加产品结构树创建人 更新人

lyh

2025-01-17 73f636092a4de604e5308a9a851f504d60a4c003

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java

@@ -351,11 +351,10 @@
        if(file == null || file.isEmpty() || !ValidateUtil.validateString(id))
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        if(!ValidateUtil.validateString(userId))
        if(!ValidateUtil.validateString(user.getUsername()))
            ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
        FileOperate operate = fileOperateService.getByDocId(id);
        if(operate == null || !userId.equals(operate.getCreateUser()))
        if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
            ExceptionCast.cast(DocumentCode.DOC_OPERATE_PUSH_FAIL);
        DocInfo en = super.getById(id);
        if(en == null)
@@ -527,11 +526,10 @@
        if(!ValidateUtil.validateString(id))
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        if(!ValidateUtil.validateString(userId))
        if(!ValidateUtil.validateString(user.getUsername()))
            ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
        FileOperate operate = fileOperateService.getByDocId(id);
        if(operate == null || !userId.equals(operate.getCreateUser()))
        if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
            ExceptionCast.cast(DocumentCode.DOC_CANCEL_PULL_ERROR);
        DocInfo en = super.getById(id);
        if(en == null)
@@ -582,14 +580,7 @@
        }
        queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
        queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
        if(ValidateUtil.validateString(docQuery.getAscStr())) {
            String[] ascArr = docQuery.getAscStr().split(",");
//            ((Page<DocInfo>) pageData).setAsc(ascArr);
        }
        if(ValidateUtil.validateString(docQuery.getDescStr())) {
            String[] descStr = docQuery.getDescStr().split(",");
//            ((Page<DocInfo>) pageData).setDesc(descStr);
        }
        queryWrapper.orderByDesc("u.create_time");
        IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(pageData, queryWrapper);
        return Result.ok(docInfoIPage);
    }
@@ -788,15 +779,7 @@
        }
        queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
        queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());

        if(ValidateUtil.validateString(docQuery.getAscStr())) {
            String[] ascArr = docQuery.getAscStr().split(",");
//            ((Page<DocInfo>) pageData).setAsc(ascArr);
        }
        if(ValidateUtil.validateString(docQuery.getDescStr())) {
            String[] descStr = docQuery.getDescStr().split(",");
//            ((Page<DocInfo>) pageData).setDesc(descStr);
        }
        queryWrapper.orderByDesc("u.create_time");
        IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDeviceDocExtList(pageData, queryWrapper);
        if (docInfoIPage != null && docInfoIPage.getRecords() != null && !docInfoIPage.getRecords().isEmpty()) {
            for (DocInfo d : docInfoIPage.getRecords()) {