bug

jiangping

2023-12-06 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5

 server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java

@@ -127,7 +127,7 @@
        if(user.getProcedureIds()!=null){
            pageWrap.setProcedureIds(user.getProcedureIds());
        }else{
            pageWrap.setUserId(user.getId());
            pageWrap.setCreateUser(user.getId());
        }
        List<PlansExtListVO> result = plansExtMapper.selectList(pageWrap);
        if(result==null||result.size()==0){
@@ -190,12 +190,6 @@
            pageWrap.getModel().setCreateUser(user.getId());
            //否则走数据权限
            pageWrap.getModel().setDepartIds(dataPermission);
         /*   if(dataPermission.size() == 0){
                //只能看自己的
                pageWrap.getModel().setCreateUser(user.getId());
            }else{

            }*/
        }
        if(user.getProcedureIds()!=null){
            pageWrap.getModel().setProcedureIds(user.getProcedureIds());
@@ -1617,6 +1611,8 @@
    public void autoWorkReport(LoginUserInfo user, AutoWorkReportDTO autoWorkReportDTO){
        if(Objects.isNull(autoWorkReportDTO)
            || Objects.isNull(autoWorkReportDTO.getCreateWorkorderRecordDTO())
            || Objects.isNull(autoWorkReportDTO.getProUserList())
            || Objects.isNull(autoWorkReportDTO.getProUserList().size()==0)
            || Objects.isNull(autoWorkReportDTO.getCreateWorkorderRecordDTO().getUnQualifiedNum())|| autoWorkReportDTO.getCreateWorkorderRecordDTO().getUnQualifiedNum().compareTo(BigDecimal.ZERO) < Constants.ZERO
            || Objects.isNull(autoWorkReportDTO.getCreateWorkorderRecordDTO().getQualifiedNum())|| autoWorkReportDTO.getCreateWorkorderRecordDTO().getQualifiedNum().compareTo(BigDecimal.ZERO) < Constants.ZERO){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -1652,8 +1648,8 @@
        Workorder param = new Workorder();
        param.setPlanId(autoWorkReportDTO.getPlansId());
        param.setPlanDate(new Date());
        CompanyUser companyUser= companyUserExtMapper.selectById(autoWorkReportDTO.getProUserList().get(Constants.ZERO));
        param.setCreateUser(companyUser.getUserId());
//        CompanyUser companyUser= companyUserExtMapper.selectById(autoWorkReportDTO.getProUserList().get(Constants.ZERO));
        param.setCreateUser(autoWorkReportDTO.getProUserList().get(Constants.ZERO));
        param.setProGroupId(autoWorkReportDTO.getProGroupId());
        param.setProUserList(autoWorkReportDTO.getProUserList());
        param.setPlanNum(num.intValue());