FIX：用户关联仓库禁止删除

app/admin/service/sys_user.go

@@ -284,6 +284,19 @@ func (e *SysUser) Remove(c *dto.SysUserDeleteReq, p *actions.DataPermission) err
 		return err
 	}
 
+	var warehouse model.Warehouse
+	var k int64
+	err = e.Orm.Model(&warehouse).Where("user_id = ?", c.GetId()).Count(&k).Error
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		return global.CreateFailedErr
+	}
+	if k > 0 {
+		err = errors.New("该用户已绑定仓库，禁止删除！")
+		e.Log.Errorf("db error: %s", err)
+		return err
+	}
+
 	if err := tx.Delete(&data, c.GetId()).Error; err != nil {
 		if errors.Is(err, model.ErrForbidDeleteSysRole) {
 			return model.ErrForbidDeleteSysRole

app/admin/service/waybill_task.go

@@ -106,6 +106,11 @@ func (e *WaybillTask) GetDataPage(c *dto.WaybillTaskGetDataPageReq) (list []nats
 	for _, id := range c.T_ids {
 		T_snid += fmt.Sprintf("%s,%d|", task.Sn, id)
 	}
+	if c.PageSize == 9999 {
+		// 获取传感器信息
+		list, count, err = nats_server.Cold_ReadDeviceDataListBy_T_snid(T_snid, c.StartTime, c.EndTime, 0, 9999)
+		return
+	}
 	// 获取传感器信息
 	list, count, err = nats_server.Cold_ReadDeviceDataListBy_T_snid(T_snid, c.StartTime, c.EndTime, c.Page, c.PageSize)
 	return