Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/plan/IotInspectPlanController.java

@@ -11,6 +11,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.inspect.plan.vo.IotInspectPl
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.plan.vo.IotInspectPlanSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectPlanService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserUpdateStatusReqVO;
@@ -18,6 +20,7 @@ import com.xingyuv.captcha.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,6 +47,8 @@ public class IotInspectPlanController {
     private IotInspectPlanService iotInspectPlanService;
     @Resource
     private AdminUserApi adminUserApi;
+    @Autowired
+    private DeptApi deptApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建巡检计划")
@@ -92,6 +97,10 @@ public class IotInspectPlanController {
                 AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(e.getCreator()));
                 if (Objects.nonNull(user)) {
                     iotInspectPlanRespVO.setCreateName(user.getNickname());
+                    if (Objects.nonNull(user.getDeptId())) {
+                        DeptRespDTO dept = deptApi.getDept(user.getDeptId());
+                        iotInspectPlanRespVO.setDeptName(Objects.nonNull(dept)?dept.getName():"");
+                    }
                 }
             }
             return iotInspectPlanRespVO;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/plan/vo/IotInspectPlanRespVO.java

@@ -68,4 +68,5 @@ public class IotInspectPlanRespVO {
     private List<String> charges;
 
     private String createName;
+    private String deptName;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceperson/IotDevicePersonController.java

@@ -141,6 +141,6 @@ public class IotDevicePersonController {
         if (CollUtil.isNotEmpty(iotDevicePersonPage.getList())) {
             return success(1L);
         }
-        return success(0L);
+        return success(-1L);
     }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderServiceImpl.java

@@ -252,7 +252,7 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
             iotInspectOrderDO.setPlanCode(iotInspectPlan.getPlanCode());
             iotInspectOrderDO.setDeleted(false);
             iotInspectOrderDO.setChargeName(Objects.nonNull(user)?user.getNickname():"");
-            iotInspectOrderDO.setDeptId(v.get(0).getDeptId());
+            iotInspectOrderDO.setDeptId(user.getDeptId());
             TenantUtils.execute(1L, () -> iotInspectOrderMapper.insert(iotInspectOrderDO));
             results.forEach(result-> result.setOrderId(iotInspectOrderDO.getId()));
             TenantUtils.execute(1L, () -> {