问题修改

ZQN

2024-06-24 d3ca2cb702a3574d67c58cef63a2cfeccf214169

问题修改

 project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java

@@ -56,8 +56,10 @@
            user.setDept(sysDept);
        } else {
            SysDept sysDept = deptService.selectDeptById(userService.getById(user.getUserId()).getDeptId());
            sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
            user.setDept(sysDept);
            if (sysDept!=null){
                sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
                user.setDept(sysDept);
            }
        }

        // 角色集合

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java

@@ -122,6 +122,7 @@
        return orderService.update(orderService.lu()
                .set(EnforceOrder::getIsEva,1)
                .set(EnforceOrder::getTotalScore, totalScore)
                .eq(EnforceOrder::getOrderId, bo.getOrderId())
        );
    }


 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java

@@ -305,8 +305,11 @@
    public Boolean doScanOrder(Long orderId)
    {
        EnforceOrder order = this.getById(orderId);
        if (order.getOrderStatus()!=2){
        if (order.getOrderStatus()<2){
            throw new BaseException("执法单还未审批！");
        }
        if (order.getOrderStatus()>2){
            throw new BaseException("执法单已确认执法！");
        }
        order.setOrderStatus(3);
        SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -336,6 +339,7 @@
                .set(StringUtils.isNotEmpty(resultBo.getRegionVideos()), EnforceOrder::getRegionVideos, resultBo.getRegionVideos())
                .set( EnforceOrder::getOrderStatus, 4)
                .set( EnforceOrder::getExecuteTime, DateUtils.getNowDate())
                .eq( EnforceOrder::getOrderId, resultBo.getOrderId())
        );
    }